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

update jenkins for canvas-rce-api image 

Closes LS-1661
flag=none

Test Plan: Jenkins selenium runs pass

Change-Id: I40b519f232926f97b8afb9c933fe6b461d123d7f
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/254458
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Aaron Ogata <aogata@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Robin Kuss <rkuss@instructure.com>
This commit is contained in:
Robin Kuss 2020-12-07 08:46:57 -06:00
parent 6286e60506
commit 43b5d065fc
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,4 +10,4 @@ REGISTRY_BASE=starlord.inscloudgate.net/jenkins
./build/new-jenkins/docker-with-flakey-network-protection.sh push $REGISTRY_BASE/selenium-chrome:"$SELENIUM_VERSION")
# pull canvas-rce-api here to avoid flakes, dependency of docker-compose.new-jenkins.selenium.yml
./build/new-jenkins/docker-with-flakey-network-protection.sh pull $BUILD_REGISTRY_FQDN/jeremyp/canvas-rce-api_web
./build/new-jenkins/docker-with-flakey-network-protection.sh pull $BUILD_REGISTRY_FQDN/jenkins/canvas-rce-api

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

@ -21,7 +21,7 @@ services:
init: true
canvasrceapi:
image: starlord.inscloudgate.net/jeremyp/canvas-rce-api_web
image: starlord.inscloudgate.net/jenkins/canvas-rce-api
environment:
ECOSYSTEM_KEY: "astringthatisactually32byteslong"
ECOSYSTEM_SECRET: "astringthatisactually32byteslong"
@ -30,4 +30,6 @@ services:
PASSENGER_MIN_INSTANCES: 2
PASSENGER_MAX_POOL_SIZE: 6
NGINX_WORKER_CONNECTIONS: 2048
STATSD_HOST: 127.0.0.1
STATSD_PORT: 8125
init: true