Skip to content

Commit 0e478e3

Browse files
committed
Run tests for correct version
Run tests for docker containers with currently build version. Containers should not be downloaded from docker repository, but be build before tests.
1 parent b6592ed commit 0e478e3

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ before_install:
1212
- docker build -t test:local ./Test
1313

1414
script:
15-
- make test
15+
- VERSION="$TRAVIS_BRANCH" make test
1616

1717
# only push up tags
1818
after_success:

test.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/usr/bin/env bash
22
DEBUG=''
3+
VERSION=${VERSION:-3.0.1-germanium}
34

45
if [ -n "$1" ] && [ $1 == 'debug' ]; then
56
DEBUG='-debug'
@@ -30,12 +31,12 @@ docker logs -f $HUB &
3031
sleep 2
3132

3233
echo 'Starting Selenium Chrome node...'
33-
NODE_CHROME=$(docker run -d --link $HUB_NAME:hub selenium/node-chrome$DEBUG:3.0.1-germanium)
34+
NODE_CHROME=$(docker run -d --link $HUB_NAME:hub selenium/node-chrome$DEBUG:${VERSION})
3435
echo 'Starting Selenium Firefox node...'
35-
NODE_FIREFOX=$(docker run -d --link $HUB_NAME:hub selenium/node-firefox$DEBUG:3.0.1-germanium)
36+
NODE_FIREFOX=$(docker run -d --link $HUB_NAME:hub selenium/node-firefox$DEBUG:${VERSION})
3637
if [ -z $DEBUG ]; then
3738
echo 'Starting Selenium PhantomJS node...'
38-
NODE_PHANTOMJS=$(docker run -d --link $HUB_NAME:hub selenium/node-phantomjs:3.0.1-germanium)
39+
NODE_PHANTOMJS=$(docker run -d --link $HUB_NAME:hub selenium/node-phantomjs:${VERSION})
3940
fi
4041
docker logs -f $NODE_CHROME &
4142
docker logs -f $NODE_FIREFOX &

0 commit comments

Comments
 (0)