Merge pull request #1612 from HSLdevcom/travis-prod-release

Improve travis build

Author: hannesj

.travis.yml

@@ -7,15 +7,6 @@ branches:
 
 cache: yarn
 
-before_install:
- - export CHROME_BIN=/usr/bin/google-chrome
- - export DISPLAY=:99.0
- - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16
- - sudo apt-get install -y libappindicator1 fonts-liberation
- - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
- - sudo dpkg -i google-chrome*.deb
- - openssl aes-256-cbc -K $encrypted_59b1a6418079_key -iv $encrypted_59b1a6418079_iv -in test/.dropbox_uploader.enc -out test/.dropbox_uploader -d
-
 language: node_js
 
 node_js:

test/deploy.sh

@@ -2,16 +2,16 @@
 set -e
 ORG=${ORG:-hsldevcom}
 
-if [[ "$TRAVIS_BRANCH" = "master" && "$TRAVIS_PULL_REQUEST" = "false" ]]; then
+if [[ -n "$TRAVIS_TAG" || ( "$TRAVIS_BRANCH" = "master" && "$TRAVIS_PULL_REQUEST" = "false") ]]; then
   docker pull $ORG/digitransit-ui:ci-$TRAVIS_COMMIT
   docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_AUTH
-  if [ -z "$TRAVIS_TAG" ]; then
-      echo "Pushing dev release to docker"
-      docker tag $ORG/digitransit-ui:ci-$TRAVIS_COMMIT $ORG/digitransit-ui:latest
-      docker push $ORG/digitransit-ui:latest
-  else
+  if [ -n "$TRAVIS_TAG" ]; then
       echo "Pushing prod release to docker"
       docker tag $ORG/digitransit-ui:ci-$TRAVIS_COMMIT $ORG/digitransit-ui:prod
       docker push $ORG/digitransit-ui:prod
+  else
+      echo "Pushing dev release to docker"
+      docker tag $ORG/digitransit-ui:ci-$TRAVIS_COMMIT $ORG/digitransit-ui:latest
+      docker push $ORG/digitransit-ui:latest
   fi
 fi

test/flow.sh

@@ -4,6 +4,14 @@
 if [ -n "$TRAVIS_TAG" ]; then exit 0; fi
 
 set -e
+
+export CHROME_BIN=/usr/bin/google-chrome
+export DISPLAY=:99.0
+/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16
+sudo apt-get install -y libappindicator1 fonts-liberation
+wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+sudo dpkg -i google-chrome*.deb
+
 ORG=${ORG:-hsldevcom}
 yarn install
 

test/visual.sh

@@ -3,21 +3,24 @@
 # do nothing if the build is for tagging a prod release
 if [ -n "$TRAVIS_TAG" ]; then exit 0; fi
 
+if [ -z "$BS_ACCESS_KEY" ]; then
+    echo "BS_ACCESS_KEY not set, failing build on purpose"
+    exit 1
+fi
+
 set -e
 ORG=${ORG:-hsldevcom}
 yarn install
 
-if [ -n "$BS_ACCESS_KEY" ]; then
-    docker run -d -e CONFIG=hsl -p 127.0.0.1:8080:8080 $ORG/digitransit-ui:ci-$TRAVIS_COMMIT
-    IDENTIFIER=${TRAVIS_COMMIT}_${VISUAL} yarn run test-visual -- --browser $VISUAL
-    RESULT=$?
-    if [ $RESULT -ne 0 ]; then
-      echo "Uploading test images to https://www.dropbox.com/sh/emh3x8h38egy2k1/AAAq_eLYDxJ0AJAwFffoZqH9a?dl=0"
-      tar czf gemini-report-$TRAVIS_COMMIT-$VISUAL.tar.gz gemini-report
-      ./test/dropbox_uploader.sh upload gemini-report-$TRAVIS_COMMIT-$VISUAL.tar.gz /gemini-report-$TRAVIS_COMMIT-$VISUAL.tar.gz
-    fi
-    exit $RESULT
-else
-    echo "BS_ACCESS_KEY not set, failing build on purpose"
-    exit 1
+openssl aes-256-cbc -K $encrypted_59b1a6418079_key -iv $encrypted_59b1a6418079_iv -in test/.dropbox_uploader.enc -out test/.dropbox_uploader -d
+docker run -d -e CONFIG=hsl -p 127.0.0.1:8080:8080 $ORG/digitransit-ui:ci-$TRAVIS_COMMIT
+
+set +e
+IDENTIFIER=${TRAVIS_COMMIT}_${VISUAL} yarn run test-visual -- --browser $VISUAL
+RESULT=$?
+if [ $RESULT -ne 0 ]; then
+    echo "Uploading test images to https://www.dropbox.com/sh/emh3x8h38egy2k1/AAAq_eLYDxJ0AJAwFffoZqH9a?dl=0"
+    tar czf gemini-report-$TRAVIS_COMMIT-$VISUAL.tar.gz gemini-report
+    ./test/dropbox_uploader.sh upload gemini-report-$TRAVIS_COMMIT-$VISUAL.tar.gz /gemini-report-$TRAVIS_COMMIT-$VISUAL.tar.gz
 fi
+exit $RESULT