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

spec: pull new jenkins images from starlord 

so we don't get rate-limited from docker hub

closes #CORE-3344

Change-Id: I5c8f0e1716a84966dc9b0f0f8595a474649f89cb
Reviewed-on: https://gerrit.instructure.com/211250
Reviewed-by: James Butters <jbutters@instructure.com>
Tested-by: Jenkins
QA-Review: James Williams <jamesw@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
This commit is contained in:
James Williams 2019-09-27 07:18:54 -06:00
parent ce591bb6ee
commit 99a54a8c4a
11 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -169,6 +169,8 @@ pipeline {
stage('Smoke Test') {
steps {
timeout(time: 10) {
sh 'build/new-jenkins/docker-compose-pull.sh'
sh 'build/new-jenkins/docker-compose-pull-selenium.sh'
sh 'build/new-jenkins/docker-compose-build-up.sh'
sh 'build/new-jenkins/docker-compose-create-migrate-database.sh'
sh 'build/new-jenkins/smoke-test.sh'

1
Jenkinsfile.frontend
View File

@ -23,6 +23,7 @@ def setDockerUp () {
echo 'Running containers'
sh 'docker ps'
sh 'printenv | sort'
sh 'build/new-jenkins/docker-compose-pull.sh'
sh 'build/new-jenkins/docker-compose-build-up.sh'
}
}

1
Jenkinsfile.rspec
View File

@ -52,6 +52,7 @@ pipeline {
checkout scm
timeout(time: 60) {
sh 'printenv | sort'
sh 'build/new-jenkins/docker-compose-pull.sh'
sh 'build/new-jenkins/docker-compose-build-up.sh'
sh 'build/new-jenkins/docker-compose-create-migrate-database.sh'
def retries = 1

2
Jenkinsfile.selenium.chrome
View File

@ -53,6 +53,8 @@ pipeline {
sh 'rm -rf ./tmp/spec_failures'
timeout(time: 60) {
sh 'printenv | sort'
sh 'build/new-jenkins/docker-compose-pull.sh'
sh 'build/new-jenkins/docker-compose-pull-selenium.sh'
sh 'build/new-jenkins/docker-compose-build-up.sh'
sh 'build/new-jenkins/docker-compose-create-migrate-database.sh'
def retries = 1

2
Jenkinsfile.selenium.performance.chrome
View File

@ -37,6 +37,8 @@ pipeline {
steps {
timeout(time: 60) {
sh 'printenv | sort'
sh 'build/new-jenkins/docker-compose-pull.sh'
sh 'build/new-jenkins/docker-compose-pull-selenium.sh'
sh 'build/new-jenkins/docker-compose-build-up.sh'
sh 'build/new-jenkins/docker-compose-create-migrate-database.sh'
// Todo: create selenium performance chrome script

1
Jenkinsfile.vendored-gems
View File

@ -36,6 +36,7 @@ pipeline {
steps {
timeout(time: 60) {
sh 'printenv | sort'
sh 'build/new-jenkins/docker-compose-pull.sh'
sh 'build/new-jenkins/docker-compose-build-up.sh'
sh 'build/new-jenkins/docker-compose-create-database.sh'
sh 'build/new-jenkins/test-gems.sh'

2
Jenkinsfile.xbrowser
View File

@ -37,6 +37,8 @@ pipeline {
steps {
timeout(time: 60) {
sh 'printenv | sort'
sh 'build/new-jenkins/docker-compose-pull.sh'
sh 'build/new-jenkins/docker-compose-pull-selenium.sh'
sh 'build/new-jenkins/docker-compose-build-up.sh'
sh 'build/new-jenkins/docker-compose-create-migrate-database.sh'
sh 'build/new-jenkins/xbrowser-test.sh'

8
build/new-jenkins/docker-compose-pull-selenium.sh Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
# pull docker images (or build them if missing)
REGISTRY_BASE=starlord.inscloudgate.net/jenkins
docker pull $REGISTRY_BASE/selenium-chrome:3.141.59-vanadium || \
(docker build -t $REGISTRY_BASE/selenium-chrome:3.141.59-vanadium docker-compose/selenium-chrome && \
docker push $REGISTRY_BASE/selenium-chrome:3.141.59-vanadium)

15
build/new-jenkins/docker-compose-pull.sh Executable file
View File

@ -0,0 +1,15 @@
#!/bin/bash
# pull docker images (or build them if missing)
REGISTRY_BASE=starlord.inscloudgate.net/jenkins
docker pull $REGISTRY_BASE/redis:alpine || \
(docker pull redis:alpine && \
docker tag redis:alpine $REGISTRY_BASE/redis:alpine && \
docker push $REGISTRY_BASE/redis:alpine)
docker pull $REGISTRY_BASE/postgres:9.5 || \
(docker build -t $REGISTRY_BASE/postgres:9.5 build/docker-compose/postgres/9.5 && \
docker push $REGISTRY_BASE/postgres:9.5)
docker pull $REGISTRY_BASE/cassandra:2.2 || \
(docker build -t $REGISTRY_BASE/cassandra:2.2 build/docker-compose/cassandra && \
docker push $REGISTRY_BASE/cassandra:2.2)

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

@ -13,7 +13,7 @@ services:
SASS_STYLE: 'compressed'
selenium-chrome:
build: ./docker-compose/selenium-chrome
image: starlord.inscloudgate.net/jenkins/selenium-chrome:3.141.59-vanadium
canvasrceapi:
image: starlord.inscloudgate.net/jeremyp/canvas-rce-api_web

6
docker-compose.new-jenkins.yml
View File

@ -25,12 +25,12 @@ services:
KNAPSACK_GENERATE_REPORT: $KNAPSACK_GENERATE_REPORT
redis:
image: redis:alpine
image: starlord.inscloudgate.net/jenkins/redis:alpine
postgres:
build: ./build/docker-compose/postgres/9.5
image: starlord.inscloudgate.net/jenkins/postgres:9.5
cassandra:
build: ./build/docker-compose/cassandra
image: starlord.inscloudgate.net/jenkins/cassandra:2.2
environment:
CASSANDRA_START_RPC: 'true'