diff --git a/Jenkinsfile b/Jenkinsfile index 57a6fc5b957..d1297bd141e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -332,6 +332,11 @@ pipeline { script { lock(label: 'canvas_build_global_mutex', quantity: 1) { timeout(60) { + // Skip translation builds for patchsets uploaded by svc.cloudjenkins + if (env.GERRIT_PATCHSET_UPLOADER_EMAIL == 'svc.cloudjenkins@instructure.com' && env.GERRIT_CHANGE_SUBJECT =~ /translation$/) { + return + } + node('master') { // For builds like Rails 6.1 prototype, we want to be able to see the build link, but // not have Gerrit vote on it. This isn't currently supported through the Gerrit Trigger @@ -343,12 +348,6 @@ pipeline { gerrit.submitReview("", "Build Started ${RUN_DISPLAY_URL}") } - // Skip builds for patchsets uploaded by svc.cloudjenkins, these are usually translation updates. - if (env.GERRIT_PATCHSET_UPLOADER_EMAIL == 'svc.cloudjenkins@instructure.com' && !configuration.isChangeMerged()) { - currentBuild.result = 'ABORTED' - error('No pre-merge builds for Service Cloud Jenkins user.') - } - if (configuration.skipCi()) { currentBuild.result = 'NOT_BUILT' gerrit.submitLintReview('-2', 'Build not executed due to [skip-ci] flag')