Upgrade Ubuntu xenial date to 20160629

Author: elgalu

CHANGELOG.md

@@ -12,6 +12,7 @@ Note image ids also change after scm-source.json has being updated which trigger
  + Upgrade Selenium to 2.53.1
  + Upgrade Firefox patch to 47.0.1
  + Add docker-compose support
+ + Upgrade Ubuntu xenial date to 20160629
  + Fix signaling issue by replacing `CMD "entry.sh"` with `CMD ["entry.sh"]`
  + Image tag details:
   + Selenium: vTBD_SELENIUM_VERSION (TBD_SELENIUM_REVISION)
@@ -24,7 +25,7 @@ Note image ids also change after scm-source.json has being updated which trigger
   + 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-28-generic x86_64
+  + Tested on kernel dev host: 4.4.0-29-generic x86_64
   + Tested on kernel CI  host: TBD_HOST_UNAME
   + Built at dev host with: Docker version 1.11.2, build b9f10c9
   + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD

CONTRIBUTING.md

@@ -13,7 +13,7 @@ For pull requests or local commits:
 
 For repository owners only:
 
-    git commit -m "Selenium 2.53.1 & Firefox 47.0.1 #102 & docker-compose #108"
+    git commit -m "Selenium 2.53.1 & Firefox 47.0.1 #102 & docker-compose #108 & Upgrade ubuntu 20160629"
     git tag -d latest #tag latest will be updated from TravisCI
     git tag 2.53.1a && git push origin tmp-2.53.1a && git push --tags
 

Dockerfile

@@ -3,9 +3,9 @@
 ###################################################
 #== Ubuntu xenial is 16.04, i.e. FROM ubuntu:16.04
 # search for more at https://registry.hub.docker.com/_/ubuntu/tags/manage/
-FROM ubuntu:xenial-20160525
+FROM ubuntu:xenial-20160629
 ENV UBUNTU_FLAVOR="xenial" \
-    UBUNTU_DATE="20160525"
+    UBUNTU_DATE="20160629"
 
 #== Ubuntu wily is 15.10, i.e. FROM ubuntu:15.10
 # FROM ubuntu:wily-20151208

TBD_DOCKER_TAG.md

@@ -12,7 +12,7 @@
   + 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-28-generic x86_64
+  + Tested on kernel dev host: 4.4.0-29-generic x86_64
   + Tested on kernel CI  host: TBD_HOST_UNAME
   + Built at dev host with: Docker version 1.11.2, build b9f10c9
   + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD

bin/entry.sh

@@ -114,6 +114,8 @@ function get_free_display() {
     #   let find_display_num=${find_display_num}+1
     local pythonCmd="from random import shuffle;list1 = list(range($MAX_DISPLAY_SEARCH));shuffle(list1);print (' '.join(str(e) for e in list1))"
     local displayNums=$(python -c "${pythonCmd}")
+    # Always find a free DISPLAY port starting with current DISP_N if it was provided
+    [ "${DISP_N}" != "-1" ] && displayNums=" ${DISP_N} ${displayNums}"
     IFS=' ' read -r -a arrayDispNums <<< "$displayNums"
     for find_display_num in ${arrayDispNums[@]}; do
       # read -r Do not treat a backslash character in any special way.
@@ -170,8 +172,9 @@ if [ ! -z "${XE_DISP_NUM}" ]; then
   export DISP_N="${XE_DISP_NUM}"
   export DISPLAY=":${DISP_N}"
   start_xvfb
-elif [ "${PICK_ALL_RANDMON_PORTS}" = "true" ] || [ "${DISP_N}" = "-1" ]; then
-  # Find a free DISPLAY port
+# elif [ "${PICK_ALL_RANDMON_PORTS}" = "true" ] || [ "${DISP_N}" = "-1" ]; then
+else
+  # Find a free DISPLAY port starting with current DISP_N if any
   i=0
   while true ; do
     let i=${i}+1
@@ -191,10 +194,10 @@ elif [ "${PICK_ALL_RANDMON_PORTS}" = "true" ] || [ "${DISP_N}" = "-1" ]; then
       break
     fi
   done
-else
-  export XEPHYR_DISPLAY=":${DISP_N}"
-  export DISPLAY=":${DISP_N}"
-  start_xvfb
+# else
+#   export XEPHYR_DISPLAY=":${DISP_N}"
+#   export DISPLAY=":${DISP_N}"
+#   start_xvfb
 fi
 
 

test/compose-test.sh

@@ -37,9 +37,14 @@ for i in $(seq 1 ${NUM_NODES}); do
   docker exec selenium_firefox_${i} errors || true
 done
 
+# FIXME: We still need to wait a bit because the nodes registration is not
+#        being waited on wait_all_done script :(
+#        mabe related to issue #83
+sleep 5
+
 # Tests can run anywere, in the hub, in the host, doesn't matter
 for i in $(seq 1 ${PARAL_TESTS}); do
-  docker exec -t selenium_chrome_${i} run_test &
+  docker exec -t selenium_hub_1 run_test &
 done
 
 # not so verbose from here

test/script_scenario_2

@@ -18,8 +18,8 @@ echo "#=============================================================="
 echo "# Scenario 2b: Forced quick container restart + run tests again"
 echo "#=============================================================="
 docker restart --time=0 grid #forced quick restart
-sleep 3 #to avoid issue #83
-docker exec grid wait_all_done 40s
+sleep 7 #to avoid issue #83
+docker exec grid wait_all_done 80s
 docker exec grid errors || true
 docker exec -t grid run_test
 docker logs grid

test/script_scenario_4

@@ -7,6 +7,15 @@ set -xe
 echo "#======================================="
 echo "# Scenario 4: Docker Compose many nodes"
 echo "#======================================="
-export NUM_NODES=5 PARAL_TESTS=5 SELENIUM_HUB_PORT="4444" \
-       WAIT_TIMEOUT="80s" WAIT_ALL_DONE="90s"
+export SELENIUM_HUB_PORT="4444"
+
+if [ "${TRAVIS}" = "true" ]; then
+  export NUM_NODES=2 PARAL_TESTS=2 \
+         WAIT_TIMEOUT="280s" WAIT_ALL_DONE="390s"
+else
+  # My local laptop has more power so hit it harder
+  export NUM_NODES=7 PARAL_TESTS=7 \
+         WAIT_TIMEOUT="80s" WAIT_ALL_DONE="90s"
+fi
+
 ./test/compose-test.sh