move Local Docker Dev stage to root level
refs DE-338 Nospot removal requires all non-build stages to not be wrapped in the protectedNode() function. Test Plan: 1. Local Docker Dev triggers correctly when files change. Change-Id: I986a85161d567c31606b73553c420cf63bdec455 Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/262571 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:
parent
8b94f04f7c
commit
5cfe22c368
|
@ -463,12 +463,6 @@ pipeline {
|
|||
string(name: 'POSTGRES_IMAGE_TAG', value: "${env.POSTGRES_IMAGE_TAG}"),
|
||||
])
|
||||
|
||||
echo 'adding Local Docker Dev Build'
|
||||
extendedStage('Local Docker Dev Build')
|
||||
.handler(buildSummaryReport)
|
||||
.required(env.GERRIT_PROJECT == 'canvas-lms' && buildConfig[FILES_CHANGED_STAGE].value('dockerDevFiles'))
|
||||
.queue(stages, jobName: '/Canvas/test-suites/local-docker-dev-smoke', buildParameters: buildParameters)
|
||||
|
||||
extendedStage('Dependency Check')
|
||||
.handler(buildSummaryReport)
|
||||
.required(configuration.isChangeMerged())
|
||||
|
@ -485,6 +479,18 @@ pipeline {
|
|||
}
|
||||
}
|
||||
|
||||
extendedStage("${FILES_CHANGED_STAGE} (Waiting for Dependencies)").waitsFor(FILES_CHANGED_STAGE, 'Builder').queue(rootStages) { _, buildConfig ->
|
||||
def nestedStages = [:]
|
||||
|
||||
echo 'adding Local Docker Dev Build'
|
||||
extendedStage('Local Docker Dev Build')
|
||||
.handler(buildSummaryReport)
|
||||
.required(env.GERRIT_PROJECT == 'canvas-lms' && buildConfig[FILES_CHANGED_STAGE].value('dockerDevFiles'))
|
||||
.queue(nestedStages, jobName: '/Canvas/test-suites/local-docker-dev-smoke', buildParameters: buildParameters)
|
||||
|
||||
parallel(nestedStages)
|
||||
}
|
||||
|
||||
extendedStage("Javascript (Waiting for Dependencies)").waitsFor(JS_BUILD_IMAGE_STAGE, 'Builder').queue(rootStages) {
|
||||
def nestedStages = [:]
|
||||
|
||||
|
|
Loading…
Reference in New Issue