Upgrade Chrome major from 51 to 52.0.2743.82

Author: elgalu

.gitignore

@@ -2,6 +2,8 @@ tmp/
 tmp_make/
 *_image/
 binaries/*.deb
+binaries/*.md5
+binaries/*.sha
 READMEBS.md
 READMEZala.sh
 .python-version

CHANGELOG.md

@@ -7,6 +7,30 @@ 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
+ + Upgrade Chrome major from 51 to 52.0.2743.82
+ + 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-32-generic x86_64
+  + Tested on kernel CI  host: TBD_HOST_UNAME
+  + Built at dev host with: Docker version 1.12.0-rc4, build e4a0dbc
+  + 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-rc2, build c72c966
+  + 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.1p
  + Date: 2016-07-19
  + Upgrade Ubuntu xenial to 20160713

CONTRIBUTING.md

@@ -8,19 +8,19 @@ For pull requests or local commits:
     open ./images/grid_console.png #to verify the versions are correct
     git checkout ./images/grid_console.png && open ./videos/chrome/*.mkv
     travis lint #if you changed .travis.yml
-    git checkout -b tmp-2.53.1p #name your branch according to your changes
+    git checkout -b tmp-2.53.1q #name your branch according to your changes
     #git add ... git commit ... git push ... open pull request
 
 For repository owners only:
 
-    git commit -m "Start xterm with a random geometry to differentiate nodes"
+    git commit -m "Upgrade Chrome major from 51 to 52.0.2743.82"
     git tag -d latest #tag latest will be updated from TravisCI
-    git tag 2.53.1p && git push origin tmp-2.53.1p && git push --tags
+    git tag 2.53.1q && git push origin tmp-2.53.1q && 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-2.53.1p && git push origin --delete tmp-2.53.1p
+    git checkout master && git pull && git branch -d tmp-2.53.1q && git push origin --delete tmp-2.53.1q
 
 -- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
 -- If Chrome version changed upload:
@@ -30,15 +30,17 @@ For repository owners only:
 ### Chrome artifact
 Keep certain bins if chrome version changed for example:
 
-    VER="51.0.2704.106"
-    wget -nv --show-progress -O binaries/google-chrome-stable_${VER}_amd64.deb "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
+    VER="52.0.2743.82"
+    cd binaries && NAME="google-chrome-stable_${VER}_amd64"
+    wget -nv --show-progress -O ${NAME}.deb "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
+    md5sum ${NAME}.deb > ${NAME}.md5 && shasum ${NAME}.deb > ${NAME}.sha
 
 ## Retry
 Failed in Travis? retry
 
-    git tag -d 2.53.1p && git push origin :2.53.1p
+    git tag -d 2.53.1q && git push origin :2.53.1q
     #git add ...
-    git commit --amend && git tag 2.53.1p && git push --force origin tmp-2.53.1p && git push --tags
+    git commit --amend && git tag 2.53.1q && git push --force origin tmp-2.53.1q && 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

@@ -251,11 +251,6 @@ RUN groupadd -g ${NORMAL_USER_GID} ${NORMAL_GROUP} \
   && echo 'ALL ALL = (ALL) NOPASSWD: ALL' >> /etc/sudoers
 ENV NORMAL_USER_HOME /home/${NORMAL_USER}
 
-#==============
-# Back to sudo
-#==============
-USER root
-
 #=====================================
 # Google Chrome - Latest through apt
 #=====================================
@@ -775,7 +770,7 @@ RUN mkdir -p ${NORMAL_USER_HOME}/tmp && cd ${NORMAL_USER_HOME}/tmp \
 # TODO: Use Google fingerprint to verify downloads
 #  https://www.google.de/linuxrepositories/
 # Also fix .deb file names with correct version
-RUN  latest_chrome_version_trigger="51.0.2704.106" \
+RUN  latest_chrome_version_trigger="52.0.2743.82" \
   && mkdir -p ${NORMAL_USER_HOME}/chrome-deb \
   && export CHROME_URL="https://dl.google.com/linux/direct" \
   && wget -nv -O \

Makefile

@@ -140,11 +140,11 @@ see: check_vncviewer
 
 # Shortcut to VNC into Firefox
 seeff:
-	$(MAKE) see browser=firefox
+	@$(MAKE) -s see browser=firefox
 
 # Shortcut to VNC into Chrome
 seech:
-	$(MAKE) see browser=chrome
+	@$(MAKE) -s see browser=chrome
 
 env:
 	env
@@ -164,8 +164,8 @@ cleanup:
 # like cleanup but verbose plus graceful stop-video
 down:
 	@if [ "${VIDEO}" = "true" ]; then \
-	  $(MAKE) stop_videos_chrome ; \
-	  $(MAKE) stop_videos_firefox ; \
+	  $(MAKE) -s stop_videos_chrome ; \
+	  $(MAKE) -s stop_videos_firefox ; \
 	fi
 	docker-compose -f ${COMPOSE_FILE} -p ${COMPOSE_PROJ_NAME} down \
 	  --remove-orphans
@@ -177,19 +177,19 @@ stop_videos:
 	done
 
 stop_videos_chrome:
-	@$(MAKE) stop_videos browser=chrome tot_nodes=${chrome}
+	@$(MAKE) -s stop_videos browser=chrome tot_nodes=${chrome}
 
 stop_videos_firefox:
-	@$(MAKE) stop_videos browser=firefox tot_nodes=${firefox}
+	@$(MAKE) -s stop_videos browser=firefox tot_nodes=${firefox}
 
 scale:
 	docker-compose -f ${COMPOSE_FILE} -p ${COMPOSE_PROJ_NAME} scale \
 	  ${APP_NAME}=1 hub=1 chrome=${chrome} firefox=${firefox}
-	$(MAKE) wait chrome=${chrome} firefox=${firefox}
+	@$(MAKE) -s wait chrome=${chrome} firefox=${firefox}
 
 compose: basic_reqs cleanup
 	docker-compose -f ${COMPOSE_FILE} -p ${COMPOSE_PROJ_NAME} up -d
-	$(MAKE) scale chrome=${chrome} firefox=${firefox}
+	@$(MAKE) -s scale chrome=${chrome} firefox=${firefox}
 
 wait:
 	./mk/wait.sh
@@ -211,34 +211,34 @@ gather_videos:
 	ls -la ./videos/
 
 gather_videos_chrome:
-	$(MAKE) gather_videos browser=chrome tot_nodes=${chrome}
+	@$(MAKE) -s gather_videos browser=chrome tot_nodes=${chrome}
 
 gather_videos_firefox:
-	$(MAKE) gather_videos browser=firefox tot_nodes=${firefox}
+	@$(MAKE) -s gather_videos browser=firefox tot_nodes=${firefox}
 
 # Gather video artifacts
 videos: gather_videos_chrome gather_videos_firefox
 
 # VNC open all. As of now only 4 are supported
 seeall: check_vncviewer
-	$(MAKE) see browser=chrome node=1
+	@$(MAKE) -s see browser=chrome node=1
 	@sleep 0.3
-	$(MAKE) see browser=firefox node=1
+	@$(MAKE) -s see browser=firefox node=1
 	@sleep 0.4
-	$(MAKE) see browser=chrome node=2
+	@$(MAKE) -s see browser=chrome node=2
 	@sleep 0.5
-	$(MAKE) see browser=firefox node=2
+	@$(MAKE) -s see browser=firefox node=2
 
 # Move them all. As of now only 4 are supported
 dock: check_wmctrl
-	@sleep 0.5 #TODO Make active wait: http://stackoverflow.com/a/19441380/511069
-	$(MAKE) move browser=chrome node=1
-	@sleep 0.7 #TODO Make active wait
-	$(MAKE) move browser=firefox node=1
-	@sleep 0.9 #TODO Make active wait
-	$(MAKE) move browser=chrome node=2
-	@sleep 1.1 #TODO Make active wait
-	$(MAKE) move browser=firefox node=2
+	@sleep 0.2 #TODO Make active wait: http://stackoverflow.com/a/19441380/511069
+	@$(MAKE) -s move browser=chrome node=1
+	@sleep 0.2 #TODO Make active wait
+	@$(MAKE) -s move browser=firefox node=1
+	@sleep 0.2 #TODO Make active wait
+	@$(MAKE) -s move browser=chrome node=2
+	@sleep 0.2 #TODO Make active wait
+	@$(MAKE) -s move browser=firefox node=2
 
 # Run self tests
 test:

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-31-generic x86_64
+  + Tested on kernel dev host: 4.4.0-32-generic x86_64
   + Tested on kernel CI  host: TBD_HOST_UNAME
   + Built at dev host with: Docker version 1.12.0-rc4, build e4a0dbc
   + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD

bin/entry.sh

@@ -6,8 +6,8 @@ stop 2>&1 >/dev/null || true
 rm -f ${LOGS_DIR}/*
 rm -f ${RUN_DIR}/*
 
-# echo "-- INFO: Available Firefox Versions: ${FIREFOX_VERSIONS}"
-echo "-- INFO: Available Firefox Versions: ${FIREFOX_VERSION}"
+echo "-- INFO: Available Google Chrome Version: $(chrome_stable_version)"
+echo "-- INFO: Available Firefox...... Version: ${FIREFOX_VERSION}"
 
 #---------------------
 # Fix/extend ENV vars
@@ -29,9 +29,6 @@ export CONTAINER_IP=$(ip addr show dev ${ETHERNET_DEVICE_NAME} | grep "inet " |
 export COMMON_CAPS="maxInstances=${MAX_INSTANCES},platform=LINUX,acceptSslCerts=true"
 export CHROME_PATH="/usr/bin/google-chrome-${CHROME_FLAVOR}"
 export CHROME_VERSION=$(${CHROME_PATH} --version 2>&1 | grep "Google Chrome" | grep -iEo "[0-9.]{2,20}.*")
-# We may need uid & gid from host machine
-export HOST_GID=$(stat -c "%g" ${VIDEOS_DIR})
-export HOST_UID=$(stat -c "%u" ${VIDEOS_DIR})
 # Video
 export FFMPEG_FRAME_SIZE="${SCREEN_WIDTH}x${SCREEN_HEIGHT}"
 
@@ -346,7 +343,7 @@ fi
 #------------------
 # Fix running user
 #------------------
-RUN_PREFIX="sudo -E HOME=/home/$NORMAL_USER -u $NORMAL_USER"
+RUN_PREFIX="sudo --preserve-env HOME=/home/$NORMAL_USER -u $NORMAL_USER"
 WHOAMI=$(whoami)
 WHOAMI_EXIT_CODE=$?
 echo "-- INFO: Container USER var is: '$USER', \$(whoami) returns '$WHOAMI', UID is '$UID'"
@@ -391,19 +388,19 @@ if [ $WHOAMI_EXIT_CODE != 0 ]; then
     echo "-- INFO: Will try to fix uid before continuing"
     # TODO: fix it ...
     echo "-- now will try to use NORMAL_USER: '$NORMAL_USER' to continue"
-    exec ${RUN_PREFIX} run-supervisord.sh --nodaemon
+    exec ${RUN_PREFIX} run-supervisord.sh
   else
     echo "-- WARN: You seem to be running docker -u {{some-non-existing-user-in-container}}"
     echo "-- will try to use NORMAL_USER: '$NORMAL_USER' instead."
-    exec ${RUN_PREFIX} run-supervisord.sh --nodaemon
+    exec ${RUN_PREFIX} run-supervisord.sh
   fi
 elif [ "$WHOAMI" = "root" ]; then
   echo "-- WARN: Container running user is 'root' so switching to less privileged one"
   echo "-- will use NORMAL_USER: '$NORMAL_USER' instead."
-  exec ${RUN_PREFIX} run-supervisord.sh --nodaemon
+  exec ${RUN_PREFIX} run-supervisord.sh
 else
   echo "-- INFO: Will use \$USER '$USER' and \$(whoami) is '$WHOAMI'"
-  exec run-supervisord.sh --nodaemon
+  exec run-supervisord.sh
 fi
 
 # Note: sudo -i creates a login shell for someUser, which implies the following:

capabilities.json

@@ -2,7 +2,7 @@
   "caps": [
     {
       "BROWSER_NAME": "chrome",
-      "VERSION": "51.0.2704.106",
+      "VERSION": "52.0.2743.82",
       "PLATFORM": "LINUX"
     },
     {

supervisor/bin/run-supervisord.sh

@@ -47,7 +47,7 @@ trap shutdown SIGHUP SIGTERM SIGINT
 
 echo -n "supervisord --version=" && supervisord --version
 
-supervisord -c /etc/supervisor/supervisord.conf --user ${USER} &
+supervisord -c /etc/supervisor/supervisord.conf --user ${USER} --nodaemon &
 SUPERVISOR_PID=$!
 
 # tells bash to wait until child processes have exited