Do not fail because of bitballoon

elgalu · Mar 16, 2018 · db1ebc2 · db1ebc2
1 parent e47e5f5
commit db1ebc2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 57 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -61,7 +61,7 @@ jobs:
 
     - env: test=Zalenium
       script:
-        - gem install bitballoon
+        - gem install bitballoon || true
         - travis_retry ./test/before_install_pull
         - travis_retry ./test/script_scenario_zalenium
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,35 +1,3 @@
-## 3.11.0-p2
- + **Changes:** https://github.com/elgalu/docker-selenium/compare/3.11.0-p1...3.11.0-p2 (2018-03-16)
-    + Leo Gallucci (12):
-        * [8e045e3] Upgrade Chrome patch level to 65.0.3325.162
-        * [ab58c48] Upgrade Firefox major from 58.0.2 to 59.0
-        * [86e0f09] Trigger build
-        * [e426f8d] WIP Fixing the build
-        * [9bf84ff] WIP Fixing the build
-        * [dff289f] WIP Fixing the build
-        * [df97ae1] WIP Fixing the build
-        * [c18d7b5] WIP Fixing the build
-        * [0ff2ddd] WIP Fixing the build
-        * [b9a4c95] WIP Fixing the build
-        * [2444f75] WIP Fixing the build
-        * [a23648e] WIP Fixing the build
- + **Image tag details:**
-    + Selenium version: 3.11.0 (e59cfb3)
-    + Chrome stable:  65.0.3325.162
-    + Firefox stable: 59.0
-    + Geckodriver: 0.20.0
-    + Chromedriver: 2.36.540471 (9c759b81a907e70363c6312294d30b6ccccc2752)
-    + Java: OpenJDK Java 1.8.0_151-8u151-b12-0ubuntu0.16.04.2-b12
-    + Default Timezone: Europe/Berlin
-    + FROM ubuntu:xenial-20180228
-    + Python: 3.5.2
-    + Tested on kernel CI  host: 4.4.0-101-generic x86_64
-    + Built at CI  host with: Docker version 17.09.0, build afdb6d4
-    + Built at CI  host with: Docker Compose version 1.17.1, build 6d101fb
-    + Image version: 3.11.0-238
-    + Image size: 1.39GB
-    + Digest: sha256:9da4390c049e20df36296a9a41fcaa3e6b87bf7296bc9e35de6a256caf5a7a73
-
 ## 3.11.0-p1
  + **Changes:** https://github.com/elgalu/docker-selenium/compare/3.11.0-p0...3.11.0-p1 (2018-03-13)
     + Diego Molina (1):

diff --git a/LATEST_RELEASE.md b/LATEST_RELEASE.md
@@ -1,22 +1,11 @@
-## 3.11.0-p2
- + **Changes:** https://github.com/elgalu/docker-selenium/compare/3.11.0-p1...3.11.0-p2 (2018-03-16)
-    + Leo Gallucci (12):
-        * [8e045e3] Upgrade Chrome patch level to 65.0.3325.162
-        * [ab58c48] Upgrade Firefox major from 58.0.2 to 59.0
-        * [86e0f09] Trigger build
-        * [e426f8d] WIP Fixing the build
-        * [9bf84ff] WIP Fixing the build
-        * [dff289f] WIP Fixing the build
-        * [df97ae1] WIP Fixing the build
-        * [c18d7b5] WIP Fixing the build
-        * [0ff2ddd] WIP Fixing the build
-        * [b9a4c95] WIP Fixing the build
-        * [2444f75] WIP Fixing the build
-        * [a23648e] WIP Fixing the build
+## 3.11.0-p1
+ + **Changes:** https://github.com/elgalu/docker-selenium/compare/3.11.0-p0...3.11.0-p1 (2018-03-13)
+    + Diego Molina (1):
+        * [2b07831] Upgrading GeckoDriver to 0.20.0
  + **Image tag details:**
     + Selenium version: 3.11.0 (e59cfb3)
-    + Chrome stable:  65.0.3325.162
-    + Firefox stable: 59.0
+    + Chrome stable:  65.0.3325.146
+    + Firefox stable: 58.0.2
     + Geckodriver: 0.20.0
     + Chromedriver: 2.36.540471 (9c759b81a907e70363c6312294d30b6ccccc2752)
     + Java: OpenJDK Java 1.8.0_151-8u151-b12-0ubuntu0.16.04.2-b12
@@ -26,7 +15,6 @@
     + Tested on kernel CI  host: 4.4.0-101-generic x86_64
     + Built at CI  host with: Docker version 17.09.0, build afdb6d4
     + Built at CI  host with: Docker Compose version 1.17.1, build 6d101fb
-    + Image version: 3.11.0-238
-    + Image size: 1.39GB
-    + Digest: sha256:9da4390c049e20df36296a9a41fcaa3e6b87bf7296bc9e35de6a256caf5a7a73
-
+    + Image version: 3.11.0-233
+    + Image size: 1.38GB
+    + Digest: sha256:b2e5640bec2800af223e59f0c3ef27b6252b4b5256084c194a4485f422687bdc
diff --git a/test/script_scenario_zalenium b/test/script_scenario_zalenium
@@ -85,8 +85,11 @@ if [ "${BITBALLOON_ACCESS_TOKEN}" != "" ] && [ "${BITBALLOON_SITE_ID}" != "" ];
   # Only update the site upon releases
   if [ "${TRAVIS_TAG}" != "" ]; then
     echo "{\"access_token\":\"${BITBALLOON_ACCESS_TOKEN}\",\"site_id\":\"${BITBALLOON_SITE_ID}\"}" > .bitballoon
-    ls -la tmp_videos/ || die "We need tmp_videos to upload to bitballoon"
-    bitballoon deploy tmp_videos/
-    #=> Site deployed: http://zalenium.bitballoon.com
+    if ls -la tmp_videos/; then
+      bitballoon deploy tmp_videos/ || true
+      #=> Site deployed: http://zalenium.bitballoon.com
+    else
+      echo "ERROR! We need tmp_videos/ to upload to bitballoon"
+    fi
   fi
 fi