Upgrade Chrome major to 53.0.2785.89

elgalu · elgalu · commit 5e35ed4644ab · 2016-09-01T10:55:10.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -25,7 +25,7 @@ matrix:
     #   com.docker.docker Incompatible CPU detected
     #   Docker requires a processor with virtualization capabilities
     - env:
-        - DOCKER_VERSION="1.12.0-rc4"
+        - DOCKER_VERSION="1.12.1-rc2"
           DOCKER_COMPOSE_VERSION="1.8.0"
           OPERATING_SYSTEM="osx"
   include:
@@ -39,14 +39,15 @@ matrix:
         - DOCKER_VERSION="stable"
           DOCKER_COMPOSE_VERSION="1.7.1"
           DOCKER_PUSH=true
+          DOCKER_PUSH_LATEST=false
     # Linux with docker:beta compose:stable/older
     - os: linux
       sudo: required
       dist: trusty
       services:
         - docker
       env:
-        - DOCKER_VERSION="1.12.0-rc4"
+        - DOCKER_VERSION="1.12.1-rc2"
           DOCKER_COMPOSE_VERSION="1.7.1"
     # Linux with docker:stable compose:beta
     - os: linux
@@ -64,13 +65,13 @@ matrix:
       services:
         - docker
       env:
-        - DOCKER_VERSION="1.12.0-rc4"
+        - DOCKER_VERSION="1.12.1-rc2"
           DOCKER_COMPOSE_VERSION="1.8.0"
     # Mac OSX: only test native docker version
     - os: osx
       osx_image: xcode8
       env:
-        - DOCKER_VERSION="1.12.0-rc4"
+        - DOCKER_VERSION="1.12.1-rc2"
           DOCKER_COMPOSE_VERSION="1.8.0"
           OPERATING_SYSTEM="osx"
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,32 @@ 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 to 53.0.2785.89
+ + Upgrade Ubuntu xenial to 20160818
+ + Upgrade BrowserStack Local 6.1
+ + 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: TBD_HOST_UNAME
+  + Built at dev 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 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
  + Upgrade Chrome patch to 52.0.2743.116
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,18 +8,18 @@ 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.1r #name your branch according to your changes
+    git checkout -b tmp-2.53.1s #name your branch according to your changes
     #git add ... git commit ... git push ... open pull request
 
 For repository owners only:
 
-    git commit -m "Upgrade Chrome patch & Chromedriver 2.23"
-    git tag -d latest && git tag 2.53.1r && git push origin tmp-2.53.1r && git push --tags
+    git commit -m "Upgrade Chrome major to 53.0.2785.89"
+    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
 -- Make sure changes got merged into master by elgalubot
 
-    git checkout master && git pull && git branch -d tmp-2.53.1r && git push origin --delete tmp-2.53.1r
+    git checkout master && git pull && git branch -d tmp-2.53.1s && git push origin --delete tmp-2.53.1s
 
 -- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
 -- If Chrome version changed upload:
@@ -29,9 +29,9 @@ For repository owners only:
 ### Chrome artifact
 Keep certain bins if chrome version changed for example:
 
-    # VER="52.0.2743.116"
     cd binaries && wget -O stable_updates.html "http://googlechromereleases.blogspot.de/search/label/Stable%20updates"
     VER=$(grep -Po '([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)' stable_updates.html | head -1)
+    echo $VER; VER="53.0.2785.89"
     NAME="google-chrome-stable_${VER}_amd64" && echo ${NAME}
     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
@@ -40,9 +40,9 @@ Keep certain bins if chrome version changed for example:
 ## Retry
 Failed in Travis? retry
 
-    git tag -d 2.53.1r && git push origin :2.53.1r
+    git tag -d 2.53.1s && git push origin :2.53.1s
     #git add ...
-    git commit --amend && git tag 2.53.1r && git push --force origin tmp-2.53.1r && git push --tags
+    git commit --amend && git tag 2.53.1s && git push --force origin tmp-2.53.1s && 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.
diff --git a/Dockerfile b/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-20160713
+FROM ubuntu:xenial-20160818
 ENV UBUNTU_FLAVOR="xenial" \
-    UBUNTU_DATE="20160713"
+    UBUNTU_DATE="20160818"
 
 #== Ubuntu wily is 15.10, i.e. FROM ubuntu:15.10
 # FROM ubuntu:wily-20151208
@@ -38,9 +38,11 @@ ENV DEBIAN_FRONTEND=noninteractive \
     DEBCONF_NONINTERACTIVE_SEEN=true
 
 # http://askubuntu.com/a/235911/134645
+# Remove with: sudo apt-key del 2EA8F35793D8809A
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 2EA8F35793D8809A \
+  && apt-key update -qqy
 # Remove with: sudo apt-key del 40976EAF437D05B5
-RUN  apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 2EA8F35793D8809A \
-  && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5 \
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5 \
   && apt-key update -qqy
 
 #========================
@@ -770,7 +772,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="52.0.2743.116" \
+RUN  latest_chrome_version_trigger="53.0.2785.89" \
   && mkdir -p ${NORMAL_USER_HOME}/chrome-deb \
   && export CHROME_URL="https://dl.google.com/linux/direct" \
   && wget -nv -O \
diff --git a/README.md b/README.md
@@ -494,7 +494,7 @@ Powered by Supervisor, the container leaves many logs;
     /var/log/cont/xvfb-stderr.log
     /var/log/cont/xvfb-stdout.log
 
-
+<!-- links -->
 [2.47.1m]: https://github.com/elgalu/docker-selenium/releases/tag/2.47.1m
 [Selenium]: https://github.com/SeleniumHQ/selenium
 [sauce]: https://saucelabs.com/selenium/selenium-grid
diff --git a/TBD_DOCKER_TAG.md b/TBD_DOCKER_TAG.md
@@ -12,9 +12,9 @@
   + 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 dev host: 4.4.0-37-generic x86_64
   + Tested on kernel CI  host: TBD_HOST_UNAME
-  + Built at dev host with: Docker version 1.12.0, build 8eab29e
+  + Built at dev 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 TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
diff --git a/capabilities.json b/capabilities.json
@@ -2,7 +2,7 @@
   "caps": [
     {
       "BROWSER_NAME": "chrome",
-      "VERSION": "52.0.2743.116",
+      "VERSION": "53.0.2785.89",
       "PLATFORM": "LINUX"
     },
     {
diff --git a/dns/etc/hosts b/dns/etc/hosts
@@ -2,5 +2,4 @@
 
 # This entries help to avoid DNS resolve issue with Sauce Connect
 162.222.73.28  saucelabs.com
-162.222.76.100 maki76100.miso.saucelabs.com
 23.55.155.27   g.symcd.com
diff --git a/test/script_push b/test/script_push
@@ -29,7 +29,11 @@ docker_login_tag_push() {
   docker tag selenium:latest elgalu/selenium:${TRAVIS_TAG}
   docker tag selenium:latest elgalu/selenium:latest
   docker push elgalu/selenium:${TRAVIS_TAG} | tee docker_push.log
-  docker push elgalu/selenium:latest
+  if [ "${DOCKER_PUSH_LATEST}" != "true" ]; then
+    echo "DOCKER_PUSH_LATEST is false so don't update tag :latest"
+  else
+    docker push elgalu/selenium:latest
+  fi
 }
 
 #################################
diff --git a/test/script_scenario_make b/test/script_scenario_make
@@ -29,13 +29,13 @@ else
   fi
   # also has a real display so we can "see"
   make see browser=chrome node=1
-  sleep 1
-  make see browser=firefox node=1
-  if [ "$(uname)" != 'Darwin' ]; then
-    sleep 3
-    make move browser=chrome node=1
-    make move browser=firefox node=1
-  fi
+  # sleep 1
+  # make see browser=firefox node=1
+  # if [ "$(uname)" != 'Darwin' ]; then
+  #   sleep 3
+  #   make move browser=chrome node=1
+  #   make move browser=firefox node=1
+  # fi
 fi
 
 make test

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"caps": [`
`3`	`3`	`{`
`4`	`4`	`"BROWSER_NAME": "chrome",`
`5`		`- "VERSION": "52.0.2743.116",`
	`5`	`+ "VERSION": "53.0.2785.89",`
`6`	`6`	`"PLATFORM": "LINUX"`
`7`	`7`	`},`
`8`	`8`	`{`