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

Only pull images if none are found in cache 

test plan:
View the logs and see that it indeed does not call the pull.sh script
unless there are no cached migrated images

Change-Id: I7a9c5ba6a631b3a41c5bb550dfbd405413321c9e
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/217524
Reviewed-by: Robert Lamb <rlamb@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Tested-by: Jenkins
QA-Review: S. Jacob Powell <spowell@instructure.com>
Product-Review: S. Jacob Powell <spowell@instructure.com>
This commit is contained in:
S. Jacob Powell 2019-11-15 15:39:49 -07:00 committed by S. Jacob Powell
parent 05d7ec06bb
commit 7625682361
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Jenkinsfile vendored
View File

@ -220,7 +220,6 @@ pipeline {
skipIfPreviouslySuccessful("smoke-test") {
timeout(time: 10) {
script {
sh 'build/new-jenkins/docker-compose-pull.sh'
sh 'build/new-jenkins/docker-compose-pull-selenium.sh'
def dbCommon = load 'build/new-jenkins/groovy/cache-migrations.groovy'
dbCommon.createMigrateBuildUpCached()

1
build/new-jenkins/groovy/cache-migrations.groovy
View File

@ -50,6 +50,7 @@ def createMigrateBuildUpCached() {
sh 'build/new-jenkins/docker-compose-create-migrate-database.sh'
commitMigratedImages()
} else {
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'
}