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

Commit 1fc0307

Browse files
committed
Upgrade Firefox patch to 50.0.2
1 parent 18edc2e commit 1fc0307

File tree

5 files changed

+41
-14
lines changed

5 files changed

+41
-14
lines changed

CHANGELOG.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,36 @@ 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 Firefox patch to 50.0.2
13+
+ Upgrade Ubuntu xenial date from 20161114 to 20161121
14+
+ Upgrade Sauce Connect patch to 4.4.2 (was 4.4.1)
15+
+ [#136] Remove saucelabs in /etc/hosts (#137)
16+
+ Image tag details:
17+
+ Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
18+
+ Selenium 3: 3.0.1 (1969d75)
19+
+ Chrome stable: TBD_CHROME_STABLE
20+
+ Firefox for Selenium 2: TBD_FIREFOX_FOR_SEL2
21+
+ Firefox for Selenium 3: TBD_FIREFOX_FOR_SEL3
22+
+ Geckodriver: TBD_GECKO_DRIVER
23+
+ Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
24+
+ Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
25+
+ Timezone: TBD_TIME_ZONE
26+
+ FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
27+
+ Python: TBD_PYTHON_VERSION
28+
+ Sauce Connect TBD_SAUCE_CONNECT_VERS, build TBD_SAUCE_CONNECT_BUILD TBD_SAUCE_CONNECT_REVISION
29+
+ BrowserStack Local version TBD_BROWSER_STACK_VERSION
30+
+ Tested on kernel dev host: 4.4.0-51-generic x86_64
31+
+ Tested on kernel CI host: TBD_HOST_UNAME
32+
+ Built at dev host with: Docker version 1.12.3, build 6b644ec
33+
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
34+
+ Built at dev host with: Docker Compose version 1.9.0, build 2585387
35+
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
36+
+ Image size: TBD_IMAGE_SIZE
37+
+ Digest: TBD_DIGEST
38+
+ Image ID: TBD_IMAGE_ID
39+
1040
## 3.0.1i
1141
+ Date: 2016-11-24
1242
+ Add WAIT_TIME_OUT_VIDEO_STOP="20s"

CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ For pull requests or local commits:
77
docker exec grid versions && ./test/after_script && travis lint
88
open ./images/grid2_console.png && open ./images/grid3_console.png && open ./videos/mobile_emulation/*.mkv
99
open test/seleIDE/videos/rc/sele_ide.mkv
10-
git checkout -b tmp-3.0.1i && git checkout ./images/grid2_console.png && git checkout ./images/grid3_console.png
10+
git checkout -b tmp-3.0.1j && git checkout ./images/grid2_console.png && git checkout ./images/grid3_console.png
1111
#git add ... git commit ... git push ... open pull request
1212

1313
For repository owners only:
1414

15-
git commit -m "Add WAIT_TIME_OUT_VIDEO_STOP=20s"
16-
git tag -d latest && git tag 3.0.1i && git push origin tmp-3.0.1i && git push --tags
15+
git commit -m "Upgrade Firefox patch to 50.0.2"
16+
git tag -d latest && git tag 3.0.1j && git push origin tmp-3.0.1j && git push --tags
1717

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

21-
git checkout master && git pull && git branch -d tmp-3.0.1i && git push origin --delete tmp-3.0.1i
21+
git checkout master && git pull && git branch -d tmp-3.0.1j && git push origin --delete tmp-3.0.1j
2222

2323
-- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
2424
-- If Chrome version changed upload:
@@ -35,9 +35,9 @@ Keep certain bins if chrome version changed for example:
3535
## Retry
3636
Failed in Travis? retry
3737

38-
git tag -d 3.0.1i && git push origin :3.0.1i
38+
git tag -d 3.0.1j && git push origin :3.0.1j
3939
#git add ...
40-
git commit --amend && git tag 3.0.1i && git push --force origin tmp-3.0.1i && git push --tags
40+
git commit --amend && git tag 3.0.1j && git push --force origin tmp-3.0.1j && git push --tags
4141

4242
## Docker push from Travis CI
4343
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#== Ubuntu xenial is 16.04, i.e. FROM ubuntu:16.04
22
# Find latest images at https://hub.docker.com/r/library/ubuntu/
33
# Layer size: big: 127.2 MB
4-
FROM ubuntu:xenial-20161114
4+
FROM ubuntu:xenial-20161121
55
ENV UBUNTU_FLAVOR="xenial" \
6-
UBUNTU_DATE="20161114"
6+
UBUNTU_DATE="20161121"
77

88
#== Ubuntu flavors - common
99
RUN echo "deb http://archive.ubuntu.com/ubuntu ${UBUNTU_FLAVOR} main universe\n" > /etc/apt/sources.list \
@@ -482,7 +482,7 @@ RUN apt-get -qqy update \
482482
# ------------------------#
483483
# https://docs.saucelabs.com/reference/sauce-connect/
484484
# Layer size: medium: 12.42 MB
485-
ENV SAUCE_CONN_VER="sc-4.4.1-linux" \
485+
ENV SAUCE_CONN_VER="sc-4.4.2-linux" \
486486
SAUCE_CONN_DOWN_URL="https://saucelabs.com/downloads"
487487
RUN cd /tmp \
488488
&& wget -nv "${SAUCE_CONN_DOWN_URL}/${SAUCE_CONN_VER}.tar.gz" \
@@ -547,7 +547,7 @@ ENV FF_LANG="en-US" \
547547

548548
#--- For Selenium 3
549549
# Layer size: big: 108.2 MB
550-
ENV FF_VER="50.0"
550+
ENV FF_VER="50.0.2"
551551
ENV FF_COMP="firefox-${FF_VER}.tar.bz2"
552552
ENV FF_URL="${FF_BASE_URL}/${FF_INNER_PATH}/${FF_VER}/${FF_PLATFORM}/${FF_LANG}/${FF_COMP}"
553553
RUN wget -nv "${FF_URL}" -O "firefox.tar.bz2" \

TBD_DOCKER_TAG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
+ Python: TBD_PYTHON_VERSION
1616
+ Sauce Connect TBD_SAUCE_CONNECT_VERS, build TBD_SAUCE_CONNECT_BUILD TBD_SAUCE_CONNECT_REVISION
1717
+ BrowserStack Local version TBD_BROWSER_STACK_VERSION
18-
+ Tested on kernel dev host: 4.4.0-47-generic x86_64
18+
+ Tested on kernel dev host: 4.4.0-51-generic x86_64
1919
+ Tested on kernel CI host: TBD_HOST_UNAME
2020
+ Built at dev host with: Docker version 1.12.3, build 6b644ec
2121
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD

dns/etc/hosts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
11
10.0.2.2 my_internal_web_server.local
2-
3-
# This entries help to avoid DNS resolve issue with Sauce Connect
4-
23.55.155.27 g.symcd.com

0 commit comments

Comments
 (0)