Skip to content
This repository was archived by the owner on Jun 30, 2021. It is now read-only.

Commit c7020b8

Browse files
committed
Upgrade Chrome patch & Chromedriver 2.23
1 parent bd97cac commit c7020b8

File tree

8 files changed

+77
-25
lines changed

8 files changed

+77
-25
lines changed

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
tmp/
22
tmp_make/
33
*_image/
4-
binaries/*.deb
5-
binaries/*.md5
6-
binaries/*.sha
4+
binaries/*
75
READMEBS.md
86
READMEZala.sh
97
.python-version

.travis.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Even though we run everything inside docker Travis require
22
# us to pick a language else it will pick Ruby by default
3-
language: generic
3+
# language: generic
4+
language: python
45

56
# Omit running tests on temporal branches,
67
# i.e. branches with names that start with "tmp"
@@ -12,6 +13,11 @@ env:
1213
global:
1314
- TEST_SLEEPS="0.7"
1415

16+
sudo: required
17+
dist: trusty
18+
services:
19+
- docker
20+
1521
matrix:
1622
allow_failures:
1723
# Currently erroring in Mac (OSX):
@@ -20,10 +26,10 @@ matrix:
2026
# Docker requires a processor with virtualization capabilities
2127
- env:
2228
- DOCKER_VERSION="1.12.0-rc4"
23-
DOCKER_COMPOSE_VERSION="1.8.0-rc2"
29+
DOCKER_COMPOSE_VERSION="1.8.0"
2430
OPERATING_SYSTEM="osx"
2531
include:
26-
# Linux with docker:stable compose:stable
32+
# Linux with docker:stable compose:stable/older
2733
- os: linux
2834
sudo: required
2935
dist: trusty
@@ -33,7 +39,7 @@ matrix:
3339
- DOCKER_VERSION="stable"
3440
DOCKER_COMPOSE_VERSION="1.7.1"
3541
DOCKER_PUSH=true
36-
# Linux with docker:beta compose:stable
42+
# Linux with docker:beta compose:stable/older
3743
- os: linux
3844
sudo: required
3945
dist: trusty
@@ -50,7 +56,7 @@ matrix:
5056
- docker
5157
env:
5258
- DOCKER_VERSION="stable"
53-
DOCKER_COMPOSE_VERSION="1.8.0-rc2"
59+
DOCKER_COMPOSE_VERSION="1.8.0"
5460
# Linux with docker:beta compose:beta
5561
- os: linux
5662
sudo: required
@@ -59,13 +65,13 @@ matrix:
5965
- docker
6066
env:
6167
- DOCKER_VERSION="1.12.0-rc4"
62-
DOCKER_COMPOSE_VERSION="1.8.0-rc2"
68+
DOCKER_COMPOSE_VERSION="1.8.0"
6369
# Mac OSX: only test native docker version
6470
- os: osx
6571
osx_image: xcode8
6672
env:
6773
- DOCKER_VERSION="1.12.0-rc4"
68-
DOCKER_COMPOSE_VERSION="1.8.0-rc2"
74+
DOCKER_COMPOSE_VERSION="1.8.0"
6975
OPERATING_SYSTEM="osx"
7076

7177
before_install:

CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,32 @@ Note image ids also change after scm-source.json has being updated which trigger
77
###### To get container versions
88
docker exec grid versions
99

10+
## TBD_DOCKER_TAG
11+
+ Date: TBD_DATE
12+
+ Upgrade Chrome patch to 52.0.2743.116
13+
+ Upgrade Chromedriver from 2.22 to 2.23
14+
+ Upgrade BrowserStack Local 5.8
15+
+ Image tag details:
16+
+ Selenium: vTBD_SELENIUM_VERSION (TBD_SELENIUM_REVISION)
17+
+ Chrome stable: TBD_CHROME_STABLE
18+
+ Firefox stable: TBD_FIREFOX_STABLE
19+
+ Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
20+
+ Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
21+
+ Timezone: TBD_TIME_ZONE
22+
+ FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
23+
+ Python: TBD_PYTHON_VERSION
24+
+ Sauce Connect TBD_SAUCE_CONNECT_VERS, build TBD_SAUCE_CONNECT_BUILD TBD_SAUCE_CONNECT_REVISION
25+
+ BrowserStack Local version TBD_BROWSER_STACK_VERSION
26+
+ Tested on kernel dev host: 4.4.0-32-generic x86_64
27+
+ Tested on kernel CI host: TBD_HOST_UNAME
28+
+ Built at dev host with: Docker version 1.12.0, build 8eab29e
29+
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
30+
+ Built at dev host with: Docker Compose version 1.8.0, build f3628c7
31+
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
32+
+ Image size: TBD_IMAGE_SIZE
33+
+ Digest: TBD_DIGEST
34+
+ Image ID: TBD_IMAGE_ID
35+
1036
## 2.53.1q
1137
+ Date: 2016-07-22
1238
+ Upgrade Chrome major from 51 to 52.0.2743.82

CONTRIBUTING.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@ For pull requests or local commits:
88
open ./images/grid_console.png #to verify the versions are correct
99
git checkout ./images/grid_console.png && open ./videos/chrome/*.mkv
1010
travis lint #if you changed .travis.yml
11-
git checkout -b tmp-2.53.1q #name your branch according to your changes
11+
git checkout -b tmp-2.53.1r #name your branch according to your changes
1212
#git add ... git commit ... git push ... open pull request
1313

1414
For repository owners only:
1515

16-
git commit -m "Upgrade Chrome major from 51 to 52.0.2743.82"
17-
git tag -d latest #tag latest will be updated from TravisCI
18-
git tag 2.53.1q && git push origin tmp-2.53.1q && git push --tags
16+
git commit -m "Upgrade Chrome patch & Chromedriver 2.23"
17+
git tag -d latest && git tag 2.53.1r && git push origin tmp-2.53.1r && git push --tags
1918

2019
-- Wait for Travis to pass OK
2120
-- Make sure changes got merged into master by elgalubot
2221

23-
git checkout master && git pull && git branch -d tmp-2.53.1q && git push origin --delete tmp-2.53.1q
22+
git checkout master && git pull && git branch -d tmp-2.53.1r && git push origin --delete tmp-2.53.1r
2423

2524
-- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
2625
-- If Chrome version changed upload:
@@ -30,17 +29,20 @@ For repository owners only:
3029
### Chrome artifact
3130
Keep certain bins if chrome version changed for example:
3231

33-
VER="52.0.2743.82"
34-
cd binaries && NAME="google-chrome-stable_${VER}_amd64"
32+
# VER="52.0.2743.116"
33+
cd binaries && wget -O stable_updates.html "http://googlechromereleases.blogspot.de/search/label/Stable%20updates"
34+
VER=$(grep -Po '([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)' stable_updates.html | head -1)
35+
NAME="google-chrome-stable_${VER}_amd64" && echo ${NAME}
3536
wget -nv --show-progress -O ${NAME}.deb "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
3637
md5sum ${NAME}.deb > ${NAME}.md5 && shasum ${NAME}.deb > ${NAME}.sha
38+
rm -f stable_updates.html && cd ..
3739

3840
## Retry
3941
Failed in Travis? retry
4042

41-
git tag -d 2.53.1q && git push origin :2.53.1q
43+
git tag -d 2.53.1r && git push origin :2.53.1r
4244
#git add ...
43-
git commit --amend && git tag 2.53.1q && git push --force origin tmp-2.53.1q && git push --tags
45+
git commit --amend && git tag 2.53.1r && git push --force origin tmp-2.53.1r && git push --tags
4446

4547
## Docker push from Travis CI
4648
Travis [steps](https://docs.travis-ci.com/user/docker/#Pushing-a-Docker-Image-to-a-Registry) involve `docker login` and docker credentials encryptions.

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ ENV DEBIAN_FRONTEND=noninteractive \
3838
DEBCONF_NONINTERACTIVE_SEEN=true
3939

4040
# http://askubuntu.com/a/235911/134645
41+
# Remove with: sudo apt-key del 40976EAF437D05B5
4142
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 2EA8F35793D8809A \
4243
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5 \
43-
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 \
4444
&& apt-key update -qqy
4545

4646
#========================
@@ -745,7 +745,7 @@ ENV CHROME_DRIVER_BASE "chromedriver.storage.googleapis.com"
745745
# Gets latest chrome driver version. Or you can hard-code it, e.g. 2.15
746746
RUN mkdir -p ${NORMAL_USER_HOME}/tmp && cd ${NORMAL_USER_HOME}/tmp \
747747
# 1st dup line CHROME_DRIVER_VERSION is just to invalidate docker cache
748-
&& CHROME_DRIVER_VERSION="2.22" \
748+
&& CHROME_DRIVER_VERSION="2.23" \
749749
# && CHROME_DRIVER_VERSION=$(curl 'https://chromedriver.storage.googleapis.com/LATEST_RELEASE' 2> /dev/null) \
750750
&& CHROME_DRIVER_URL="https://${CHROME_DRIVER_BASE}/${CHROME_DRIVER_VERSION}/${CHROME_DRIVER_FILE}" \
751751
&& wget -nv -O chromedriver_linux${CPU_ARCH}.zip ${CHROME_DRIVER_URL} \
@@ -770,7 +770,7 @@ RUN mkdir -p ${NORMAL_USER_HOME}/tmp && cd ${NORMAL_USER_HOME}/tmp \
770770
# TODO: Use Google fingerprint to verify downloads
771771
# https://www.google.de/linuxrepositories/
772772
# Also fix .deb file names with correct version
773-
RUN latest_chrome_version_trigger="52.0.2743.82" \
773+
RUN latest_chrome_version_trigger="52.0.2743.116" \
774774
&& mkdir -p ${NORMAL_USER_HOME}/chrome-deb \
775775
&& export CHROME_URL="https://dl.google.com/linux/direct" \
776776
&& wget -nv -O \

TBD_DOCKER_TAG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
+ BrowserStack Local version TBD_BROWSER_STACK_VERSION
1515
+ Tested on kernel dev host: 4.4.0-32-generic x86_64
1616
+ Tested on kernel CI host: TBD_HOST_UNAME
17-
+ Built at dev host with: Docker version 1.12.0-rc4, build e4a0dbc
17+
+ Built at dev host with: Docker version 1.12.0, build 8eab29e
1818
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
19-
+ Built at dev host with: Docker Compose version 1.8.0-rc2, build c72c966
19+
+ Built at dev host with: Docker Compose version 1.8.0, build f3628c7
2020
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
2121
+ Image size: TBD_IMAGE_SIZE
2222
+ Digest: TBD_DIGEST

bin/get_chrome_stable.sh

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/usr/bin/env bash
2+
3+
# set -e: exit asap if a command exits with a non-zero status
4+
# set -u: treat unset variables as an error and exit immediately
5+
# set -x: print each command right before it is executed
6+
set -eux
7+
8+
mkdir -p ./chrome-deb && cd chrome-deb
9+
export CHROME_URL="https://dl.google.com/linux/direct"
10+
wget -nv --show-progress -O chrome_amd64.deb "${CHROME_URL}/google-chrome-stable_current_amd64.deb"
11+
12+
set +e #do not fail from now on
13+
14+
wget -O stable_updates.html "http://googlechromereleases.blogspot.de/search/label/Stable%20updates"
15+
VER=$(grep -Po '([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)' stable_updates.html | head -1)
16+
NAME="google-chrome-stable_${VER}_amd64"
17+
mv chrome_amd64.deb ${NAME}.deb
18+
19+
md5sum ${NAME}.deb > ${NAME}.md5
20+
shasum ${NAME}.deb > ${NAME}.sha

capabilities.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"caps": [
33
{
44
"BROWSER_NAME": "chrome",
5-
"VERSION": "52.0.2743.82",
5+
"VERSION": "52.0.2743.116",
66
"PLATFORM": "LINUX"
77
},
88
{

0 commit comments

Comments
 (0)