use one label and error

v1v · Oct 2, 2020 · 2a3d98f · 2a3d98f
1 parent 7c218ea
commit 2a3d98f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -105,18 +105,15 @@ pipeline {
             def content = readYaml(file: 'Jenkinsfile.yml')
             println content
             if (content?.disabled?.when?.labels && beatsWhen(project: 'top-level', content: content?.disabled?.when)) {
-              def message = 'Pull Request has been configured to be disabled when there is a skip-ci label match'
-              warnError(message) {
-                error message
-              }
+              error 'Pull Request has been configured to be disabled when there is a skip-ci label match'
             } else {
               content['projects'].each { projectName ->
                 generateStages(project: projectName, changeset: content['changeset']).each { k,v ->
                   mapParallelTasks["${k}"] = v
                 }
               }
               notifyBuildReason()
-              //parallel(mapParallelTasks)
+              parallel(mapParallelTasks)
             }
           }
         }

diff --git a/Jenkinsfile.yml b/Jenkinsfile.yml
@@ -44,6 +44,5 @@ disabled:
     when:
         labels:      ## Skip the GitHub Pull Request builds if any of the given GitHub labels match with the assigned labels in the PR.
             - skip-ci
-            - skip-ci-build
         ## TODO: This will allow to configure what to do based on the PR configuration
         draft: true  ## Skip the GitHub Pull Request builds with Draft PRs.