From 78ee32bc833ab7ade72ba1eb1eef19e2438c3764 Mon Sep 17 00:00:00 2001 From: Mike Bonnet Date: Thu, 17 Oct 2019 07:07:41 -0700 Subject: [PATCH] enable parallel job execution With the use of C3IaaS, resource contention in the main OpenShift project will be dramatically reduced. This allows jobs to run in paralle, increasing throughput and reducing lag time for feedback on changes. --- .../koji/pipelines/templates/mbs-build-template.yaml | 2 +- .../integration/koji/pipelines/templates/mbs-build.Jenkinsfile | 1 - .../koji/pipelines/templates/mbs-greenwave-trigger.Jenkinsfile | 1 - .../koji/pipelines/templates/mbs-greenwave-trigger.yaml | 2 +- .../koji/pipelines/templates/mbs-image-promotion-template.yaml | 2 +- .../koji/pipelines/templates/mbs-image-promotion.Jenkinsfile | 1 - .../pipelines/templates/mbs-integration-test-template.yaml | 2 +- .../koji/pipelines/templates/mbs-integration-test.Jenkinsfile | 1 - .../koji/pipelines/templates/mbs-polling-pagure.yaml | 3 +-- .../pipelines/templates/mbs-repotracker-trigger.Jenkinsfile | 1 - .../koji/pipelines/templates/mbs-repotracker-trigger.yaml | 2 +- 11 files changed, 6 insertions(+), 12 deletions(-) diff --git a/openshift/integration/koji/pipelines/templates/mbs-build-template.yaml b/openshift/integration/koji/pipelines/templates/mbs-build-template.yaml index 9addd5fc..57fca670 100644 --- a/openshift/integration/koji/pipelines/templates/mbs-build-template.yaml +++ b/openshift/integration/koji/pipelines/templates/mbs-build-template.yaml @@ -221,7 +221,7 @@ objects: labels: app: "${NAME}" spec: - runPolicy: "Serial" + runPolicy: "Parallel" completionDeadlineSeconds: 1800 source: git: diff --git a/openshift/integration/koji/pipelines/templates/mbs-build.Jenkinsfile b/openshift/integration/koji/pipelines/templates/mbs-build.Jenkinsfile index 5238f59d..08b08f93 100644 --- a/openshift/integration/koji/pipelines/templates/mbs-build.Jenkinsfile +++ b/openshift/integration/koji/pipelines/templates/mbs-build.Jenkinsfile @@ -42,7 +42,6 @@ pipeline { timestamps() timeout(time: 120, unit: 'MINUTES') buildDiscarder(logRotator(numToKeepStr: '10')) - disableConcurrentBuilds() skipDefaultCheckout() } environment { diff --git a/openshift/integration/koji/pipelines/templates/mbs-greenwave-trigger.Jenkinsfile b/openshift/integration/koji/pipelines/templates/mbs-greenwave-trigger.Jenkinsfile index d38e11dc..2add6d30 100644 --- a/openshift/integration/koji/pipelines/templates/mbs-greenwave-trigger.Jenkinsfile +++ b/openshift/integration/koji/pipelines/templates/mbs-greenwave-trigger.Jenkinsfile @@ -1,7 +1,6 @@ // Use scripted syntax because CIBuildTrigger currently doesn't support the declarative syntax properties([ buildDiscarder(logRotator(numToKeepStr: '10')), - disableConcurrentBuilds(), pipelineTriggers([ // example: https://github.com/jenkinsci/jms-messaging-plugin/blob/9b9387c3a52f037ba0d019c2ebcf2a2796fc6397/src/test/java/com/redhat/jenkins/plugins/ci/integration/AmqMessagingPluginIntegrationTest.java [$class: 'CIBuildTrigger', diff --git a/openshift/integration/koji/pipelines/templates/mbs-greenwave-trigger.yaml b/openshift/integration/koji/pipelines/templates/mbs-greenwave-trigger.yaml index 62a309ff..0d36c31f 100644 --- a/openshift/integration/koji/pipelines/templates/mbs-greenwave-trigger.yaml +++ b/openshift/integration/koji/pipelines/templates/mbs-greenwave-trigger.yaml @@ -72,7 +72,7 @@ objects: labels: app: "${NAME}" spec: - runPolicy: "Serial" + runPolicy: "Parallel" completionDeadlineSeconds: 1800 source: git: diff --git a/openshift/integration/koji/pipelines/templates/mbs-image-promotion-template.yaml b/openshift/integration/koji/pipelines/templates/mbs-image-promotion-template.yaml index 1cbdec98..4a38ab5e 100644 --- a/openshift/integration/koji/pipelines/templates/mbs-image-promotion-template.yaml +++ b/openshift/integration/koji/pipelines/templates/mbs-image-promotion-template.yaml @@ -85,7 +85,7 @@ objects: labels: app: "${NAME}" spec: - runPolicy: "Serial" # FIXME: Parallel is supported, but we have limited quota in UpShift. + runPolicy: "Parallel" completionDeadlineSeconds: 1800 source: git: diff --git a/openshift/integration/koji/pipelines/templates/mbs-image-promotion.Jenkinsfile b/openshift/integration/koji/pipelines/templates/mbs-image-promotion.Jenkinsfile index d9cc3cad..c4e37857 100644 --- a/openshift/integration/koji/pipelines/templates/mbs-image-promotion.Jenkinsfile +++ b/openshift/integration/koji/pipelines/templates/mbs-image-promotion.Jenkinsfile @@ -39,7 +39,6 @@ pipeline { timestamps() timeout(time: 30, unit: 'MINUTES') buildDiscarder(logRotator(numToKeepStr: '10')) - disableConcurrentBuilds() skipDefaultCheckout() } environment { diff --git a/openshift/integration/koji/pipelines/templates/mbs-integration-test-template.yaml b/openshift/integration/koji/pipelines/templates/mbs-integration-test-template.yaml index c51568f7..cf67f6de 100644 --- a/openshift/integration/koji/pipelines/templates/mbs-integration-test-template.yaml +++ b/openshift/integration/koji/pipelines/templates/mbs-integration-test-template.yaml @@ -99,7 +99,7 @@ objects: labels: app: "${NAME}" spec: - runPolicy: "Serial" # FIXME: Parallel is supported, but we have limited quota in UpShift. + runPolicy: "Parallel" completionDeadlineSeconds: 1800 source: git: diff --git a/openshift/integration/koji/pipelines/templates/mbs-integration-test.Jenkinsfile b/openshift/integration/koji/pipelines/templates/mbs-integration-test.Jenkinsfile index 62956051..5b8e6d5a 100644 --- a/openshift/integration/koji/pipelines/templates/mbs-integration-test.Jenkinsfile +++ b/openshift/integration/koji/pipelines/templates/mbs-integration-test.Jenkinsfile @@ -36,7 +36,6 @@ pipeline { timestamps() timeout(time: 60, unit: 'MINUTES') buildDiscarder(logRotator(numToKeepStr: '10')) - disableConcurrentBuilds() skipDefaultCheckout() } environment { diff --git a/openshift/integration/koji/pipelines/templates/mbs-polling-pagure.yaml b/openshift/integration/koji/pipelines/templates/mbs-polling-pagure.yaml index e06561d7..7a908fc6 100644 --- a/openshift/integration/koji/pipelines/templates/mbs-polling-pagure.yaml +++ b/openshift/integration/koji/pipelines/templates/mbs-polling-pagure.yaml @@ -83,7 +83,7 @@ objects: labels: app: "${NAME}" spec: - runPolicy: "Serial" + runPolicy: "Parallel" completionDeadlineSeconds: 1800 strategy: type: JenkinsPipeline @@ -127,7 +127,6 @@ objects: timestamps() timeout(time: 60, unit: 'MINUTES') buildDiscarder(logRotator(numToKeepStr: '10')) - disableConcurrentBuilds() skipDefaultCheckout() } environment { diff --git a/openshift/integration/koji/pipelines/templates/mbs-repotracker-trigger.Jenkinsfile b/openshift/integration/koji/pipelines/templates/mbs-repotracker-trigger.Jenkinsfile index 6efcfb59..eaa4b718 100644 --- a/openshift/integration/koji/pipelines/templates/mbs-repotracker-trigger.Jenkinsfile +++ b/openshift/integration/koji/pipelines/templates/mbs-repotracker-trigger.Jenkinsfile @@ -1,7 +1,6 @@ // Use scripted syntax because CIBuildTrigger currently doesn't support the declarative syntax properties([ buildDiscarder(logRotator(numToKeepStr: '10')), - disableConcurrentBuilds(), pipelineTriggers([ // example: https://github.com/jenkinsci/jms-messaging-plugin/blob/9b9387c3a52f037ba0d019c2ebcf2a2796fc6397/src/test/java/com/redhat/jenkins/plugins/ci/integration/AmqMessagingPluginIntegrationTest.java [$class: 'CIBuildTrigger', diff --git a/openshift/integration/koji/pipelines/templates/mbs-repotracker-trigger.yaml b/openshift/integration/koji/pipelines/templates/mbs-repotracker-trigger.yaml index ff3222d5..f9018ca8 100644 --- a/openshift/integration/koji/pipelines/templates/mbs-repotracker-trigger.yaml +++ b/openshift/integration/koji/pipelines/templates/mbs-repotracker-trigger.yaml @@ -94,7 +94,7 @@ objects: labels: app: "${NAME}" spec: - runPolicy: "Serial" + runPolicy: "Parallel" completionDeadlineSeconds: 1800 source: git: