Chores: finish starting => be ready & apt-key 3B4FE6ACC0B21F32

Author: elgalu

.travis.yml

@@ -30,16 +30,17 @@ matrix:
           OPERATING_SYSTEM="osx"
   include:
     # Linux with docker:stable compose:stable/older
+    # Use DOCKER_PUSH_LATEST=false to debug
     - os: linux
       sudo: required
       dist: trusty
       services:
         - docker
       env:
         - DOCKER_VERSION="stable"
-          DOCKER_COMPOSE_VERSION="1.7.1"
+          DOCKER_COMPOSE_VERSION="1.8.0"
           DOCKER_PUSH=true
-          DOCKER_PUSH_LATEST=false
+          DOCKER_PUSH_LATEST=true
     # Linux with docker:beta compose:stable/older
     - os: linux
       sudo: required
@@ -48,7 +49,7 @@ matrix:
         - docker
       env:
         - DOCKER_VERSION="1.12.1-rc2"
-          DOCKER_COMPOSE_VERSION="1.7.1"
+          DOCKER_COMPOSE_VERSION="1.8.0"
     # Linux with docker:stable compose:beta
     - os: linux
       sudo: required

CHANGELOG.md

@@ -7,31 +7,33 @@ Note image ids also change after scm-source.json has being updated which trigger
 ###### To get container versions
     docker exec grid versions
 
-## 2.53.1s
- + Date: 2016-09-01
+## TBD_DOCKER_TAG
+ + Date: TBD_DATE
  + Upgrade Chrome major to 53.0.2785.89
  + Upgrade Ubuntu xenial to 20160818
  + Upgrade BrowserStack Local 6.1
- + Image tag details:
-  + Selenium: v2.53.1 (a36b8b1)
-  + Chrome stable:  53.0.2785.89
-  + Firefox stable: 47.0.1
-  + Chromedriver: 2.23.409687 (c46e862757edc04c06b1bd88724d15a5807b84d1)
-  + Java: Oracle Java 9-ea+130
-  + Timezone: Europe/Berlin
-  + FROM ubuntu:xenial-20160818
-  + Python: 2.7.12
-  + Sauce Connect 4.3.16, build 2396 39e807b
-  + BrowserStack Local version 6.1
+ + Chore: "to finish starting" => "to be ready"
+ + Chore: Add missing apt-key 3B4FE6ACC0B21F32
+ + Image tag details:
+  + Selenium: vTBD_SELENIUM_VERSION (TBD_SELENIUM_REVISION)
+  + Chrome stable:  TBD_CHROME_STABLE
+  + Firefox stable: TBD_FIREFOX_STABLE
+  + Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
+  + Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
+  + Timezone: TBD_TIME_ZONE
+  + FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
+  + Python: TBD_PYTHON_VERSION
+  + Sauce Connect TBD_SAUCE_CONNECT_VERS, build TBD_SAUCE_CONNECT_BUILD TBD_SAUCE_CONNECT_REVISION
+  + BrowserStack Local version TBD_BROWSER_STACK_VERSION
   + Tested on kernel dev host: 4.4.0-37-generic x86_64
-  + Tested on kernel CI  host: 3.19.0-66-generic x86_64
+  + Tested on kernel CI  host: TBD_HOST_UNAME
   + Built at dev host with: Docker version 1.12.1, build 23cf638
-  + Built at CI  host with: Docker version 1.12.1, build 23cf638
+  + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
   + Built at dev host with: Docker Compose version 1.8.0, build f3628c7
-  + Built at CI  host with: Docker Compose version 1.7.1, build 0a9ab35
-  + Image size: 2.552 GB
-  + Digest: sha256:f08bd524f0a867e2217f67aa7e8f325d48d31a7e946d70dffcfcbfe43a40a731
-  + Image ID: sha256:de80c19943340300763aa2c40199ec949f2d734f8107666e3c9d2916cfba84d5
+  + Built at CI  host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
+  + Image size: TBD_IMAGE_SIZE
+  + Digest: TBD_DIGEST
+  + Image ID: TBD_IMAGE_ID
 
 ## 2.53.1r
  + Date: 2016-08-09

CONTRIBUTING.md

@@ -13,7 +13,7 @@ For pull requests or local commits:
 
 For repository owners only:
 
-    git commit -m "Upgrade Chrome major to 53.0.2785.89"
+    git commit -m "Chores: finish starting => be ready & apt-key 3B4FE6ACC0B21F32"
     git tag -d latest && git tag 2.53.1s && git push origin tmp-2.53.1s && git push --tags
 
 -- Wait for Travis to pass OK

Dockerfile

@@ -44,6 +44,9 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 2EA8F35793D8809A \
 # Remove with: sudo apt-key del 40976EAF437D05B5
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5 \
   && apt-key update -qqy
+# Remove with: sudo apt-key del 3B4FE6ACC0B21F32
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 \
+  && apt-key update -qqy
 
 #========================
 # Miscellaneous packages

browserstack/bin/start-browserstack.sh

@@ -37,7 +37,7 @@ function shutdown {
   exit 0
 }
 
-# Now wait for the tunnel to finish starting
+# Now wait for the tunnel to be ready
 timeout --foreground ${BSTACK_WAIT_TIMEOUT} wait-browserstack.sh
 
 # Run function shutdown() when this process a killer signal

docker-compose-jenkins.yml

@@ -0,0 +1,24 @@
+version: '2'
+# wget -nv https://git.io/vKiKx -O docker-compose.yml
+services:
+  hub:
+    image: elgalu/selenium
+    environment:
+      - GRID=true
+      - CHROME=false
+      - FIREFOX=false
+
+  chrome:
+    image: elgalu/selenium
+    shm_size: 1g
+    environment:
+      - GRID=false
+      - CHROME=true
+      - FIREFOX=false
+
+  firefox:
+    image: elgalu/selenium
+    environment:
+      - GRID=false
+      - CHROME=false
+      - FIREFOX=true

docs/hub_and_nodes.md

@@ -62,7 +62,7 @@ Firefox will also attach to the host machine network interface.
       elgalu/selenium
 
 ### Wait
-Is convenient to wait for all the nodes to finish starting correctly, also to catch errors before starting the tests in vane:
+Is convenient to wait for all the nodes to start correctly, also to catch errors before starting the tests in vane:
 
       docker exec node1_ch wait_all_done 30s
       docker exec node2_ch wait_all_done 30s

docs/hub_and_nodes_alternatives.md

@@ -83,7 +83,7 @@ Firefox will also attach to the `seleniums` network interface.
       elgalu/selenium
 
 ### Wait
-Is convenient to wait for all the nodes to finish starting correctly, also to catch errors before starting the tests in vane:
+Is convenient to wait for all the nodes to start correctly, also to catch errors before starting the tests in vane:
 
       docker exec node1_ch wait_all_done 30s
       docker exec node2_ch wait_all_done 30s

host-scripts/loop-wait-docker.sh

@@ -17,7 +17,7 @@ die () {
 [ -z "$1" ] && die "Need 1st argument: CONTAINER_ID"
 CONTAINER_ID=${1}
 
-echo -n "Waiting for docker-selenium to finish starting..."
+echo -n "Waiting for docker-selenium to be ready..."
 while ! docker exec ${CONTAINER_ID} \
     grep 'Container docker internal IP' /var/log/cont/xterm-stdout.log \
     > /dev/null 2>&1; do

saucelabs/bin/start-saucelabs.sh

@@ -73,7 +73,7 @@ function shutdown {
 echo "Waiting for file ${SAUCE_TUNNEL_READY_FILE} to be created..."
 while ! ls -l "${SAUCE_TUNNEL_READY_FILE}" >/dev/null 2>&1; do sleep 0.1; done
 
-# Now wait for the tunnel to finish starting
+# Now wait for the tunnel to be ready
 timeout --foreground ${SAUCE_WAIT_TIMEOUT} wait-saucelabs.sh
 
 # Run function shutdown() when this process a killer signal