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

Commit 71a3c40

Browse files
committed
Upgrade Selenium 3 patch 3.0.1 (was 3.0.0)
1 parent b126b36 commit 71a3c40

File tree

9 files changed

+217
-133
lines changed

9 files changed

+217
-133
lines changed

.travis.yml

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
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
4-
# language: ruby
5-
language: ruby
3+
# Choose a lightweight base image; we provide our own build tools.
4+
# https://github.com/lukasmartinelli/hadolint/blob/master/.travis.yml#L1
5+
# `language: generic` was failing in OSX
6+
language: c
67

78
# Omit running tests on temporal branches,
89
# i.e. branches with names that start with "tmp"
@@ -15,26 +16,21 @@ env:
1516
- TEST_SLEEPS="0.7"
1617
- ADDED_TEST_SLEEP="6.5"
1718

18-
# sudo: required
19-
# dist: trusty
20-
# services:
21-
# - docker
22-
2319
matrix:
2420
allow_failures:
2521
# Currently erroring in Mac (OSX):
2622
# https://travis-ci.org/elgalu/docker-selenium/jobs/143553463#L636
2723
# com.docker.docker Incompatible CPU detected
2824
# Docker requires a processor with virtualization capabilities
2925
- env:
30-
- DOCKER_VERSION="1.12.2"
31-
DOCKER_COMPOSE_VERSION="1.8.0"
26+
- DOCKER_VERSION="stable"
27+
DOCKER_COMPOSE_VERSION="stable"
3228
OPERATING_SYSTEM="osx"
3329
include:
3430
# Linux with docker:stable compose:stable
3531
# Use DOCKER_PUSH_LATEST=false to debug
3632
- os: linux
37-
language: ruby
33+
language: c
3834
sudo: required
3935
dist: trusty
4036
services:
@@ -46,40 +42,40 @@ matrix:
4642
DOCKER_PUSH_LATEST=true
4743
# Linux with docker:beta/older compose:beta/older
4844
- os: linux
49-
language: ruby
45+
language: c
5046
sudo: required
5147
dist: trusty
5248
services:
5349
- docker
5450
env:
55-
- DOCKER_VERSION="1.12.1"
51+
- DOCKER_VERSION="1.12.2-rc2"
5652
DOCKER_COMPOSE_VERSION="1.8.1"
5753
# Linux with docker:stable compose:beta/older
5854
- os: linux
59-
language: ruby
55+
language: c
6056
sudo: required
6157
dist: trusty
6258
services:
6359
- docker
6460
env:
6561
- DOCKER_VERSION="stable"
66-
DOCKER_COMPOSE_VERSION="1.8.0"
62+
DOCKER_COMPOSE_VERSION="1.9.0-rc1"
6763
# Linux with docker:beta/older compose:stable
6864
- os: linux
69-
language: ruby
65+
language: c
7066
sudo: required
7167
dist: trusty
7268
services:
7369
- docker
7470
env:
75-
- DOCKER_VERSION="1.12.1"
76-
DOCKER_COMPOSE_VERSION="1.8.0"
71+
- DOCKER_VERSION="1.12.2-rc2"
72+
DOCKER_COMPOSE_VERSION="1.9.0-rc1"
7773
# Mac OSX: only test native docker version
7874
- os: osx
7975
osx_image: xcode8
8076
env:
81-
- DOCKER_VERSION="1.12.2"
82-
DOCKER_COMPOSE_VERSION="1.8.0"
77+
- DOCKER_VERSION="stable"
78+
DOCKER_COMPOSE_VERSION="stable"
8379
OPERATING_SYSTEM="osx"
8480

8581
before_install:

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 Selenium 3 patch 3.0.1 (was 3.0.0)
13+
+ Upgrade Chrome patch to 54.0.2840.71
14+
+ Upgrade Firefox patch to 49.0.2
15+
+ Upgrade Sauce Connect patch to 4.4.1 (was 4.4.0)
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-45-generic x86_64
31+
+ Tested on kernel CI host: TBD_HOST_UNAME
32+
+ Built at dev host with: Docker version 1.12.2, build bb80604
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.8.1, build 878cff1
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.0c
1141
+ Date: 2016-10-16
1242
+ Upgrade Selenium to stable 3.0.0 (was beta)

CONTRIBUTING.md

Lines changed: 7 additions & 7 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.0c && git checkout ./images/grid2_console.png && git checkout ./images/grid3_console.png
10+
git checkout -b tmp-3.0.1a && 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 "Selenium 3 stable & Chrome 54.0.2840.59"
16-
git tag -d latest && git tag 3.0.0c && git push origin tmp-3.0.0c && git push --tags
15+
git commit -m "Upgrade Selenium 3 patch 3.0.1 (was 3.0.0)"
16+
git tag -d latest && git tag 3.0.1a && git push origin tmp-3.0.1a && 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.0c && git push origin --delete tmp-3.0.0c
21+
git checkout master && git pull && git branch -d tmp-3.0.1a && git push origin --delete tmp-3.0.1a
2222

2323
-- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
2424
-- If Chrome version changed upload:
@@ -28,17 +28,17 @@ For repository owners only:
2828
### Chrome artifact
2929
Keep certain bins if chrome version changed for example:
3030

31-
cd ~/tmp_binaries && VER="54.0.2840.59" && NAME="google-chrome-stable_${VER}_amd64" && echo ${NAME}
31+
cd ~/tmp_binaries && VER="54.0.2840.71" && 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
3434
cp ${NAME}.md5 ${NAME}.sha ~/dosel/binaries
3535

3636
## Retry
3737
Failed in Travis? retry
3838

39-
git tag -d 3.0.0c && git push origin :3.0.0c
39+
git tag -d 3.0.1a && git push origin :3.0.1a
4040
#git add ...
41-
git commit --amend && git tag 3.0.0c && git push --force origin tmp-3.0.0c && git push --tags
41+
git commit --amend && git tag 3.0.1a && git push --force origin tmp-3.0.1a && git push --tags
4242

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

0 commit comments

Comments
 (0)