From ef40ea5b5d372ae30d0087727ce1fbf2d1c9f14e Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 11 Mar 2014 09:09:11 -0700 Subject: [PATCH] Remove concurrency restriction from all jobs We can't guarantee that with 8 jenkins masters anymore anyway, and this can cause problems if Jenkins gets stuck on a job; all other jobs scheduled on the same master will wait for it. Change-Id: Ifb20b6819e5f27da449f2a46d463a29b43695f18 --- .../files/jenkins_job_builder/config/api-jobs.yaml | 3 --- .../files/jenkins_job_builder/config/elastic-recheck.yaml | 1 - .../jenkins_job_builder/config/infra-publications.yaml | 2 -- .../files/jenkins_job_builder/config/manuals-jobs.yaml | 5 ----- .../files/jenkins_job_builder/config/manuals.yaml | 4 ---- .../files/jenkins_job_builder/config/mirror.yaml | 6 ------ .../jenkins_job_builder/config/openstack-publish-jobs.yaml | 1 - .../files/jenkins_job_builder/config/python-jobs.yaml | 1 - .../files/jenkins_job_builder/config/requirements.yaml | 1 - .../files/jenkins_job_builder/config/translation-jobs.yaml | 5 ----- 10 files changed, 29 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml index 6882c1159f..1b789f8b0f 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml @@ -24,7 +24,6 @@ - job: name: openstack-api-ref - concurrent: false node: bare-precise builders: @@ -48,7 +47,6 @@ # this copies static files from www - job: name: openstack-api-site - concurrent: false node: bare-precise builders: @@ -66,7 +64,6 @@ - job: name: compute-api-v2.0-wadl - concurrent: false node: bare-precise builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/elastic-recheck.yaml b/modules/openstack_project/files/jenkins_job_builder/config/elastic-recheck.yaml index 5394cf68a7..269bf1e8d6 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/elastic-recheck.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/elastic-recheck.yaml @@ -1,6 +1,5 @@ - job: name: elastic-recheck-docs - concurrent: false node: bare-precise builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml b/modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml index dfe31cc7c1..ca8d5c5019 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml @@ -1,7 +1,6 @@ # simply copy the contents of the repository to the server, no building needed - job: name: infra-publications-publish - concurrent: false node: bare-precise builders: @@ -28,7 +27,6 @@ - job: name: infra-publications-publish-index - concurrent: false node: bare-precise builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml index 2cc6d1ccf5..f04c9db9bd 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml @@ -2,7 +2,6 @@ name: 'openstack-{manual}' project-type: maven node: bare-precise - concurrent: false prebuilders: - gerrit-git-prep @@ -38,7 +37,6 @@ name: 'openstack-install-deploy-guide-{distribution}' project-type: maven - concurrent: false node: bare-precise properties: @@ -74,7 +72,6 @@ - job-template: name: 'openstack-install-deploy-guide-{lang}' - concurrent: false node: bare-precise properties: @@ -100,7 +97,6 @@ name: openstack-{oldmanual}-old project-type: maven node: bare-precise - concurrent: false prebuilders: - gerrit-git-prep @@ -136,7 +132,6 @@ name: openstack-{install}-{distribution}-old project-type: maven node: bare-precise - concurrent: false prebuilders: - gerrit-git-prep diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml index 64bb611bbe..f3f293b050 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml @@ -13,7 +13,6 @@ # in zuul/layout.yaml specified to only run against master branch. - job: name: openstack-docs-site - concurrent: false node: bare-precise builders: @@ -37,7 +36,6 @@ - job: name: openstack-ha-guide project-type: maven - concurrent: false node: bare-precise properties: @@ -75,7 +73,6 @@ - job: name: openstack-operations-guide project-type: maven - concurrent: false node: bare-precise properties: @@ -110,7 +107,6 @@ - job-template: name: 'openstack-operations-guide-{lang}' - concurrent: false node: bare-precise github-org: openstack diff --git a/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml b/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml index bbef62710b..12c89925d9 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml @@ -1,7 +1,6 @@ - job: name: 'periodic-mirror-python26' node: mirror26 - concurrent: false wrappers: - timeout: @@ -20,7 +19,6 @@ - job: name: 'post-mirror-python26' node: mirror26 - concurrent: false wrappers: - timeout: @@ -39,7 +37,6 @@ - job: name: 'periodic-mirror-python27' node: mirror27 - concurrent: false wrappers: - timeout: @@ -58,7 +55,6 @@ - job: name: 'post-mirror-python27' node: mirror27 - concurrent: false wrappers: - timeout: @@ -77,7 +73,6 @@ - job: name: 'periodic-mirror-python33' node: mirror33 - concurrent: false wrappers: - timeout: @@ -96,7 +91,6 @@ - job: name: 'post-mirror-python33' node: mirror33 - concurrent: false wrappers: - timeout: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml index 042061d4dc..0347150af4 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml @@ -20,7 +20,6 @@ - job-template: name: '{name}-merge-release-tags' - concurrent: false builders: - gerrit-git-prep diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml index 9a0c8e0f27..c4e8374b15 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml @@ -195,7 +195,6 @@ - job-template: name: '{name}-branch-tarball' - concurrent: false node: bare-precise builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml index 61663f4307..706b37bf04 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml @@ -34,7 +34,6 @@ - job: name: propose-requirements-updates node: proposal - concurrent: false builders: - gerrit-git-prep diff --git a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml index 60447a7275..9648854194 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml @@ -1,6 +1,5 @@ - job-template: name: '{name}-upstream-translation-update' - concurrent: false builders: - gerrit-git-prep @@ -15,7 +14,6 @@ - job-template: name: '{name}-propose-translation-update' - concurrent: false builders: - shell: | @@ -35,7 +33,6 @@ - job: name: 'horizon-upstream-translation-update' - concurrent: false builders: - gerrit-git-prep @@ -50,7 +47,6 @@ - job: name: manuals-upstream-translation-update - concurrent: false builders: - gerrit-git-prep @@ -65,7 +61,6 @@ - job: name: manuals-propose-translation-update - concurrent: false builders: - shell: |