ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade to latest release of selenium docker image 

upgrade selenium version to latest release, also change to use
env vars rather than having version in multiple files to update.

flag = none

Test Plan
-Jenkins selenium builds pass

Change-Id: I7fc5787da7ceb99cbe0cfda2fc3b947cffee57de
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/241424
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Rex Fleischer <rfleischer@instructure.com>
Reviewed-by: Ryan Norton <rnorton@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
This commit is contained in:
James Butters 2020-06-29 11:23:08 -06:00
parent a2c7c54485
commit c757e82b0e
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/docker-compose/selenium-chrome/Dockerfile
View File

@ -1,5 +1,5 @@
# Keep this image version tag synced with Gemfile.d/test.rb
FROM selenium/standalone-chrome-debug:3.141.59-20200409
ARG SELENIUM_VERSION=3.141.59-20200525
FROM selenium/standalone-chrome-debug:$SELENIUM_VERSION
COPY entry_point.sh /opt/bin/custom_entry_point.sh
USER root

6
build/new-jenkins/docker-compose-pull-selenium.sh
View File

@ -5,6 +5,6 @@ set -x -o errexit -o errtrace -o nounset -o pipefail
# pull docker images (or build them if missing)
REGISTRY_BASE=starlord.inscloudgate.net/jenkins
docker pull $REGISTRY_BASE/selenium-chrome:3.141.59-20200409 || \
(docker build -t $REGISTRY_BASE/selenium-chrome:3.141.59-20200409 build/docker-compose/selenium-chrome && \
docker push $REGISTRY_BASE/selenium-chrome:3.141.59-20200409)
docker pull $REGISTRY_BASE/selenium-chrome:"$SELENIUM_VERSION" || \
(docker build -t $REGISTRY_BASE/selenium-chrome:"$SELENIUM_VERSION" --build-arg SELENIUM_VERSION="$SELENIUM_VERSION" build/docker-compose/selenium-chrome && \
docker push $REGISTRY_BASE/selenium-chrome:"$SELENIUM_VERSION")

1
build/new-jenkins/groovy/rspec.groovy
View File

@ -88,6 +88,7 @@ def _runRspecTestSuite(
"DOCKER_PROCESSES=$docker_processes",
"FORCE_FAILURE=$force_failure",
"POSTGRES_PASSWORD=sekret",
"SELENIUM_VERSION=3.141.59-20200525"
]) {
try {
cleanAndSetup()

2
docker-compose.new-jenkins-selenium.yml
View File

@ -14,7 +14,7 @@ services:
SASS_STYLE: 'compressed'
selenium-chrome:
image: starlord.inscloudgate.net/jenkins/selenium-chrome:3.141.59-20200409
image: starlord.inscloudgate.net/jenkins/selenium-chrome:$SELENIUM_VERSION
environment:
SCREEN_WIDTH: 1680
SCREEN_HEIGHT: 1050