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

run buildDockerImageStage.&patchsetImage without async steps 

flag = none

Change-Id: Id1f642b0cc92120c6675cc671f364d7d0eaa7b71
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/294942
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
This commit is contained in:
James Butters 2022-06-28 06:48:23 -06:00
parent d58280f57a
commit 7429163d3f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile.crystalball
View File

@ -176,7 +176,7 @@ pipeline {
.hooks(buildSummaryReportHooks.call())
.obeysAllowStages(false)
.timeout(20)
.execute(buildDockerImageStage.&patchsetImage)
.execute{ buildDockerImageStage.patchsetImage() }
extendedStage('Run Migrations')
.hooks(buildSummaryReportHooks.call())

4
build/new-jenkins/library/vars/buildDockerImageStage.groovy
View File

@ -154,7 +154,7 @@ def premergeCacheImage() {
}
}
def patchsetImage(asyncStepsStr) {
def patchsetImage(asyncStepsStr = '') {
credentials.withStarlordCredentials {
def cacheScope = configuration.isChangeMerged() ? env.IMAGE_CACHE_MERGE_SCOPE : env.IMAGE_CACHE_BUILD_SCOPE
@ -180,7 +180,7 @@ def patchsetImage(asyncStepsStr) {
build/new-jenkins/docker-build.sh $PATCHSET_TAG
$asyncStepsStr
$asyncStepsStr
"""
} catch (e) {
handleDockerBuildFailure(PATCHSET_TAG, e)