Skip to content

Commit

Permalink
getting travis ready for merge into development, points dockerfile to
Browse files Browse the repository at this point in the history
one in development branch, expected to fail until org.geppetto
'update-virgo' is merge to development
  • Loading branch information
jrmartin committed Oct 1, 2018
1 parent 74b13f7 commit aa2242f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ script:
- docker --version
- cd $TRAVIS_BUILD_DIR/src/main/webapp/js/pages/tests/casperjs
- echo "$TRAVIS_BRANCH"
- travis_retry docker build -t="geppetto" --build-arg mainBranch=$TRAVIS_BRANCH https://github.com/openworm/org.geppetto.git#update-virgo:utilities/docker/geppetto/
- travis_retry docker build -t="geppetto" --build-arg mainBranch=$TRAVIS_BRANCH https://github.com/openworm/org.geppetto.git#development:utilities/docker/geppetto/
- travis_retry docker run -t -dit --name=geppetto_container -p 28081:8080 geppetto
- bash $TRAVIS_BUILD_DIR/src/main/webapp/js/pages/tests/casperjs/utilities/test_geppetto_server.sh
- sleep 30
Expand Down

0 comments on commit aa2242f

Please sign in to comment.