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

Commit 03d03c3

Browse files
committed
Upgrade Chrome stable patch 113 & SC 4.4.0
1 parent 2696de5 commit 03d03c3

File tree

4 files changed

+37
-11
lines changed

4 files changed

+37
-11
lines changed

CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,31 @@ 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 (stable) 53.0.2785.113
13+
+ Upgrade Sauce Connect (minor) 4.4.0
14+
+ Image tag details:
15+
+ Selenium: vTBD_SELENIUM_VERSION (TBD_SELENIUM_REVISION)
16+
+ Chrome stable: TBD_CHROME_STABLE
17+
+ Firefox stable: TBD_FIREFOX_STABLE
18+
+ Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
19+
+ Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
20+
+ Timezone: TBD_TIME_ZONE
21+
+ FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
22+
+ Python: TBD_PYTHON_VERSION
23+
+ Sauce Connect TBD_SAUCE_CONNECT_VERS, build TBD_SAUCE_CONNECT_BUILD TBD_SAUCE_CONNECT_REVISION
24+
+ BrowserStack Local version TBD_BROWSER_STACK_VERSION
25+
+ Tested on kernel dev host: 4.4.0-38-generic x86_64
26+
+ Tested on kernel CI host: TBD_HOST_UNAME
27+
+ Built at dev host with: Docker version 1.12.1, build 23cf638
28+
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
29+
+ Built at dev host with: Docker Compose version 1.8.0, build f3628c7
30+
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
31+
+ Image size: TBD_IMAGE_SIZE
32+
+ Digest: TBD_DIGEST
33+
+ Image ID: TBD_IMAGE_ID
34+
1035
## 2.53.1v
1136
+ Date: 2016-09-10
1237
+ Upgrade Chromedriver from 2.23 to 2.24

CONTRIBUTING.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,39 @@ For pull requests or local commits:
66
time (./test/bef && ./test/install && ./test/script_start && ./test/script_end) ; beep
77
docker exec grid versions && ./test/after_script && travis lint
88
open ./images/grid_console.png && open ./videos/chrome/*.mkv
9-
git checkout -b tmp-2.53.1v && git checkout ./images/grid_console.png
9+
git checkout -b tmp-2.53.1w && git checkout ./images/grid_console.png
1010
#git add ... git commit ... git push ... open pull request
1111

1212
For repository owners only:
1313

14-
git commit -m "Upgrade Chromedriver from 2.23 to 2.24"
15-
git tag -d latest && git tag 2.53.1v && git push origin tmp-2.53.1v && git push --tags
14+
git commit -m "Upgrade Chrome stable patch 113 & SC 4.4.0"
15+
git tag -d latest && git tag 2.53.1w && git push origin tmp-2.53.1w && git push --tags
1616

1717
-- Wait for Travis to pass OK
1818
-- Make sure changes got merged into master by elgalubot
1919

20-
git checkout master && git pull && git branch -d tmp-2.53.1v && git push origin --delete tmp-2.53.1v
20+
git checkout master && git pull && git branch -d tmp-2.53.1w && git push origin --delete tmp-2.53.1w
2121

2222
-- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
2323
-- If Chrome version changed upload:
2424

25-
~/docker/binaries/
25+
~/tmp_binaries
2626

2727
### Chrome artifact
2828
Keep certain bins if chrome version changed for example:
2929

30-
cd binaries && VER="53.0.2785.101"
30+
cd ~/tmp_binaries && VER="53.0.2785.113"
3131
NAME="google-chrome-stable_${VER}_amd64" && echo ${NAME}
3232
wget -nv --show-progress -O ${NAME}.deb "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
3333
md5sum ${NAME}.deb > ${NAME}.md5 && shasum ${NAME}.deb > ${NAME}.sha
34+
cp ${NAME}.md5 ${NAME}.sha ~/docker/binaries
3435

3536
## Retry
3637
Failed in Travis? retry
3738

38-
git tag -d 2.53.1v && git push origin :2.53.1v
39+
git tag -d 2.53.1w && git push origin :2.53.1w
3940
#git add ...
40-
git commit --amend && git tag 2.53.1v && git push --force origin tmp-2.53.1v && git push --tags
41+
git commit --amend && git tag 2.53.1w && git push --force origin tmp-2.53.1w && git push --tags
4142

4243
## Docker push from Travis CI
4344
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ RUN SHA="154cb4c84f28ac3e0ac1ce5409faea65c15d2d02" \
630630
# Sauce Connect Tunneling #
631631
# ------------------------#
632632
# https://docs.saucelabs.com/reference/sauce-connect/
633-
ENV SAUCE_CONN_VER="sc-4.3.16-linux" \
633+
ENV SAUCE_CONN_VER="sc-4.4.0-linux" \
634634
SAUCE_CONN_DOWN_URL="https://saucelabs.com/downloads"
635635
RUN cd /tmp \
636636
&& wget -nv "${SAUCE_CONN_DOWN_URL}/${SAUCE_CONN_VER}.tar.gz" \
@@ -775,7 +775,7 @@ RUN mkdir -p ${NORMAL_USER_HOME}/tmp && cd ${NORMAL_USER_HOME}/tmp \
775775
# TODO: Use Google fingerprint to verify downloads
776776
# https://www.google.de/linuxrepositories/
777777
# Also fix .deb file names with correct version
778-
RUN latest_chrome_version_trigger="53.0.2785.101" \
778+
RUN latest_chrome_version_trigger="53.0.2785.113" \
779779
&& mkdir -p ${NORMAL_USER_HOME}/chrome-deb \
780780
&& export CHROME_URL="https://dl.google.com/linux/direct" \
781781
&& wget -nv -O \

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": "53.0.2785.101",
5+
"VERSION": "53.0.2785.113",
66
"PLATFORM": "LINUX"
77
},
88
{

0 commit comments

Comments
 (0)