fix parallel logs build for migration caching

refs DE-23

Test Plan
1. Ensure that build works against master
2. Ensure that build works against specific patchset

Change-Id: I898cb46db5c7287358bae80133685deecce9aab6
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/249700
Reviewed-by: Kyle Rosenbaum <krosenbaum@instructure.com>
Reviewed-by: James Butters <jbutters@instructure.com>
Reviewed-by: Andrea Cirulli <andrea.cirulli@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
This commit is contained in:
Aaron Ogata 2020-10-09 09:30:33 -07:00
parent 36a3e08f50
commit 6eee1dad02
1 changed files with 15 additions and 2 deletions

View File

@ -39,6 +39,12 @@ def ignoreBuildNeverStartedError(block) {
}
}
def getMigrationsTag(name) {
def migrations = load 'build/new-jenkins/groovy/migrations.groovy'
(env.GERRIT_REFSPEC.contains('master')) || !migrations.cacheLoadFailed() ? migrations.imageMergeTag(name) : migrations.imagePatchsetTag(name)
}
def getPatchsetTag() {
(env.GERRIT_REFSPEC.contains('master')) ? "${configuration.buildRegistryPath()}:${env.GERRIT_BRANCH}" : imageTag.patchset()
}
@ -74,13 +80,20 @@ pipeline {
steps {
script {
def stages = [:]
def distribution = load 'build/new-jenkins/groovy/distribution.groovy'
distribution.stashBuildScripts()
distribution.addRSpecSuites(stages)
distribution.addSeleniumSuites(stages)
parallel(stages)
withEnv([
"CASSANDRA_IMAGE_TAG=${getMigrationsTag('cassandra')}",
"DYNAMODB_IMAGE_TAG=${getMigrationsTag('dynamodb')}",
"POSTGRES_IMAGE_TAG=${getMigrationsTag('postgres')}"
]) {
parallel(stages)
}
}
}
}