Re-enable VIDEO_STOP_SLEEP_SECS=1 for 1 sec video fix

Author: elgalu

CHANGELOG.md

@@ -7,6 +7,31 @@ 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
+ + Re-enable VIDEO_STOP_SLEEP_SECS="1" for 1 sec video fix
+ + Image tag details:
+  + Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
+  + Selenium 3: 3.1.0 (86a5d70)
+  + 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
+  + Tested on kernel dev host: 4.4.0-64-generic x86_64
+  + Tested on kernel CI  host: TBD_HOST_UNAME
+  + Built at dev host with: Docker version 1.13.1, build 092cba3
+  + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
+  + Built at dev host with: Docker Compose version 1.11.2, build dfed245
+  + 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.1.0-p0
  + Date: 2017-02-24
  + Upgrade Selenium minor from 3.0.1 to 3.1.0

CONTRIBUTING.md

@@ -12,7 +12,7 @@ For pull requests or local commits:
 
 For repository owners only:
 
-    git commit -m "Upgrade Selenium minor from 3.0.1 to 3.1.0"
+    git commit -m "Re-enable VIDEO_STOP_SLEEP_SECS="1" for 1 sec video fix"
     git tag -d latest && git tag `cat VERSION` && git push origin tmp-`cat VERSION` && git push --tags
 
 -- Wait for Travis to pass OK

Dockerfile

@@ -864,7 +864,7 @@ ENV FIREFOX_VERSION="${FF_VER}" \
   VIDEO_FILE_NAME="" \
   VIDEO_CHUNK_SECS="00:05:00" \
   VIDEO_CHUNKS_MAX=999 \
-  VIDEO_STOP_SLEEP_SECS="2" \
+  VIDEO_STOP_SLEEP_SECS="1" \
   WAIT_TIME_OUT_VIDEO_STOP="20s" \
   VIDEOS_DIR="/home/seluser/videos" \
   XMANAGER="fluxbox" \

VERSION

@@ -1 +1 @@
-3.1.0-p0
+3.1.0-p1

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

@@ -22,8 +22,9 @@ VID_TOOL_PID=$!
 # sudo killall -SIGINT avconv
 function shutdown {
   echo "Trapped SIGTERM or SIGINT so shutting down ffmpeg gracefully..."
+  sleep ${VIDEO_STOP_SLEEP_SECS}
   kill -SIGTERM ${VID_TOOL_PID} || true
-  # sleep ${VIDEO_STOP_SLEEP_SECS}
+  sleep ${VIDEO_STOP_SLEEP_SECS}
   wait ${VID_TOOL_PID}
   fix_videos.sh
   echo "ffmpeg shutdown complete."

video-rec/bin/stop-video

@@ -25,8 +25,9 @@ fi
 # Stop video recording
 #----------------------
 export VIDEO=false
+sleep ${VIDEO_STOP_SLEEP_SECS}
 supervisorctl -c /etc/supervisor/supervisord.conf stop video-rec
-# sleep ${VIDEO_STOP_SLEEP_SECS}
+sleep ${VIDEO_STOP_SLEEP_SECS}
 
 # Avoid waiting forever using the `timeout` command
 if timeout --foreground ${WAIT_TIME_OUT_VIDEO_STOP} \