Add FLUXBOX_START_MAX_RETRIES

CHANGELOG.md

@@ -7,11 +7,40 @@ Note image ids also change after scm-source.json has being updated which trigger
 ###### To get container versions
     docker exec grid versions
 
+## TBD_DOCKER_TAG
+ + Date: TBD_DATE
+ + Add FLUXBOX_START_MAX_RETRIES
+ + Increase WAIT_FOREGROUND_RETRY
+ + Image tag details:
+  + Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
+  + Selenium 3: 3.0.1 (1969d75)
+  + Chrome stable:  TBD_CHROME_STABLE
+  + Firefox for Selenium 2: TBD_FIREFOX_FOR_SEL2
+  + Firefox for Selenium 3: TBD_FIREFOX_FOR_SEL3
+  + Geckodriver: TBD_GECKO_DRIVER
+  + 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-45-generic x86_64
+  + Tested on kernel CI  host: TBD_HOST_UNAME
+  + Built at dev host with: Docker version 1.12.3, build 6b644ec
+  + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
+  + Built at dev host with: Docker Compose version 1.8.1, build 878cff1
+  + 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
+
 ## 3.0.1b
  + Date: 2016-10-28
  + Upgrade Chromedriver to 2.25 (was 2.24)
  + Move back from Java 9 to Java 8 to save space
  + Added option -e VIDEO_STOP_SLEEP_SECS="1"
+ + Upgrade BrowserStack minor to 6.5 (was 6.4)
  + Image tag details:
   + Selenium 2: 2.53.1 (a36b8b1)
   + Selenium 3: 3.0.1 (1969d75)

CONTRIBUTING.md

@@ -7,18 +7,18 @@ For pull requests or local commits:
     docker exec grid versions && ./test/after_script && travis lint
     open ./images/grid2_console.png && open ./images/grid3_console.png && open ./videos/mobile_emulation/*.mkv
     open test/seleIDE/videos/rc/sele_ide.mkv
-    git checkout -b tmp-3.0.1b && git checkout ./images/grid2_console.png && git checkout ./images/grid3_console.png
+    git checkout -b tmp-3.0.1c && git checkout ./images/grid2_console.png && git checkout ./images/grid3_console.png
     #git add ... git commit ... git push ... open pull request
 
 For repository owners only:
 
-    git commit -m "Upgrade Chromedriver to 2.25 (was 2.24)"
-    git tag -d latest && git tag 3.0.1b && git push origin tmp-3.0.1b && git push --tags
+    git commit -m "Add FLUXBOX_START_MAX_RETRIES"
+    git tag -d latest && git tag 3.0.1c && git push origin tmp-3.0.1c && git push --tags
 
 -- Wait for Travis to pass OK
 -- Make sure changes got merged into master by elgalubot
 
-    git checkout master && git pull && git branch -d tmp-3.0.1b && git push origin --delete tmp-3.0.1b
+    git checkout master && git pull && git branch -d tmp-3.0.1c && git push origin --delete tmp-3.0.1c
 
 -- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
 -- If Chrome version changed upload:
@@ -36,9 +36,9 @@ Keep certain bins if chrome version changed for example:
 ## Retry
 Failed in Travis? retry
 
-    git tag -d 3.0.1b && git push origin :3.0.1b
+    git tag -d 3.0.1c && git push origin :3.0.1c
     #git add ...
-    git commit --amend && git tag 3.0.1b && git push --force origin tmp-3.0.1b && git push --tags
+    git commit --amend && git tag 3.0.1c && git push --force origin tmp-3.0.1c && git push --tags
 
 ## Docker push from Travis CI
 Travis [steps](https://docs.travis-ci.com/user/docker/#Pushing-a-Docker-Image-to-a-Registry) involve `docker login` and docker credentials encryptions.

Dockerfile

@@ -1100,7 +1100,7 @@ ENV FIREFOX_VERSION="${FF_VER}" \
   VNC_STORE_PWD_FILE="${NORMAL_USER_HOME}/.vnc/passwd" \
   BIN_UTILS="/usr/bin" \
   MEM_JAVA_PERCENT=80 \
-  WAIT_FOREGROUND_RETRY="1s" \
+  WAIT_FOREGROUND_RETRY="2s" \
   WAIT_VNC_FOREGROUND_RETRY="7s" \
   XVFB_STARTRETRIES=0 \
   XMANAGER_STARTRETRIES=0 \
@@ -1179,28 +1179,28 @@ ENV FIREFOX_VERSION="${FF_VER}" \
   RC_FIREFOX="true" \
   VIDEO_FILE_EXTENSION="mkv" \
   VIDEO_FILE_NAME="" \
-  VIDEO_FLUSH_SECS="0.5" \
   VIDEO_CHUNK_SECS="00:05:00" \
   VIDEO_CHUNKS_MAX=999 \
-  VIDEO_STOP_SLEEP_SECS="1" \
+  VIDEO_STOP_SLEEP_SECS="2" \
   VIDEOS_DIR="${NORMAL_USER_HOME}/videos" \
   XMANAGER="fluxbox" \
+  FLUXBOX_START_MAX_RETRIES=5 \
   SAUCE_TUNNEL="false" \
   SAUCE_USER_NAME="" \
   SAUCE_API_KEY="" \
   SAUCE_TUNNEL_DOCTOR_TEST="false" \
   SAUCE_TUNNEL_ID="docker-selenium" \
   SAUCE_TUNNEL_READY_FILE="/tmp/sauce-connect-ready" \
   SAUCE_LOCAL_SEL_PORT="${DEFAULT_SAUCE_LOCAL_SEL_PORT}" \
-  SAUCE_WAIT_TIMEOUT="140s" \
-  SAUCE_WAIT_RETRY_TIMEOUT="290s" \
+  SAUCE_WAIT_TIMEOUT="2m" \
+  SAUCE_WAIT_RETRY_TIMEOUT="3m" \
   SAUCE_TUNNEL_MAX_RETRY_ATTEMPTS="1" \
   BSTACK_TUNNEL="false" \
   BSTACK_ACCESS_KEY="" \
   BSTACK_TUNNEL_ID="docker-selenium" \
   BSTACK_TUNNEL_OPTS="-skipCheck -v -forcelocal" \
-  BSTACK_WAIT_TIMEOUT="100s" \
-  BSTACK_WAIT_RETRY_TIMEOUT="220s" \
+  BSTACK_WAIT_TIMEOUT="2m" \
+  BSTACK_WAIT_RETRY_TIMEOUT="3m" \
   TAIL_LOG_LINES="15" \
   SHM_TRY_MOUNT_UNMOUNT="false" \
   SHM_SIZE="512M" \

docker-compose.yml

@@ -1,3 +1,5 @@
+# TODO: implement env vars defaults `${FOO-default}`
+# once docker-compose 1.9 is long stable
 version: '2'
 
 services:

video-rec/bin/start-video-rec.sh

@@ -5,10 +5,6 @@ set -e
 
 # Wait for this process dependencies
 timeout --foreground ${WAIT_TIMEOUT} wait-xvfb.sh
-# timeout --foreground ${WAIT_TIMEOUT} wait-vnc.sh
-# timeout --foreground ${WAIT_TIMEOUT} wait-selenium-hub.sh
-# timeout --foreground ${WAIT_TIMEOUT} wait-selenium-node-chrome.sh
-# timeout --foreground ${WAIT_TIMEOUT} wait-selenium-node-firefox.sh
 
 # Make it portable
 [ -z "${VIDEO_BASE_PATH}" ] && export \

video-rec/etc/supervisor/conf.d/video-rec.conf

@@ -2,7 +2,7 @@
 
 ;The relative priority of the program in the start and shutdown ordering.
 ;Lower priorities indicate programs that start first and shut down last.
-priority=70
+priority=85
 
 ;User to run-as, note environment expansion outside of `command` is only
 ;supported in supervisor >= 3.2

xmanager/bin/start-xmanager.sh

@@ -54,7 +54,7 @@ elif [ "${XMANAGER}" = "fluxbox" ]; then
         echo "-- WARN: wait-xmanager.sh failed! for DISPLAY=${DISPLAY}"
         killall fluxbox || true
       fi
-      if [ ${i} -gt 3 ]; then
+      if [ ${i} -gt ${FLUXBOX_START_MAX_RETRIES} ]; then
         echoerr "-- ERROR: Failed to start Fluxbox at $0 after many retries."
         break
       fi

xterm/bin/start-xterm.sh

@@ -59,8 +59,6 @@ timeout --foreground ${BSTACK_WAIT_RETRY_TIMEOUT} wait-browserstack.sh || \
 
 if [ "${VIDEO}" = "true" ]; then
   start-video &
-  # timeout --foreground ${WAIT_TIMEOUT} wait-video-rec.sh || \
-  #   shutdown "Failed while waiting for video recording to start!"
 fi
 
 # TODO: Re enable shutdown at some point. But fails when

xterm/etc/supervisor/conf.d/xterm.conf

@@ -2,7 +2,7 @@
 
 ;The relative priority of the program in the start and shutdown ordering.
 ;Lower priorities indicate programs that start first and shut down last.
-priority=80
+priority=99
 
 ;User to run-as, note environment expansion outside of `command` is only
 ;supported in supervisor >= 3.2