From 1c17d23f76120dbfeeee5d07f8ed17917e596864 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Fri, 6 Nov 2015 16:25:17 -0700 Subject: [PATCH] remove default "concurrent" setting from jobs. Several jobs had an explicit "concurrent: false" setting. This is already the default behavior in JJB. Remove these lines in order to reduce the clutter. --- .../config/definitions/calamari-clients-centos.yml | 1 - .../config/definitions/calamari-clients-precise-vagrant.yml | 1 - .../config/definitions/calamari-clients-precise.yml | 1 - .../config/definitions/calamari-clients-rhel.yml | 1 - .../config/definitions/calamari-clients-rhel7.yml | 1 - .../config/definitions/calamari-clients-trusty.yml | 1 - .../config/definitions/calamari-clients-vagrant.yml | 1 - .../config/definitions/calamari-clients-wheezy.yml | 1 - calamari-clients/config/definitions/calamari-clients.yml | 1 - .../config/definitions/calamari-server-centos.yml | 1 - .../config/definitions/calamari-server-precise.yml | 1 - calamari-server-rhel/config/definitions/calamari-server-rhel.yml | 1 - .../config/definitions/calamari-server-rhel7.yml | 1 - .../config/definitions/calamari-server-trusty.yml | 1 - .../config/definitions/calamari-server-vagrant.yml | 1 - .../config/definitions/calamari-server-wheezy.yml | 1 - calamari-server/config/definitions/calamari-server.yml | 1 - ceph-build-next/config/definitions/ceph-build-next.yml | 1 - .../config/definitions/ceph-build-pull-requests.yml | 1 - ceph-build/config/definitions/ceph-build.yml | 1 - ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml | 1 - .../config/definitions/ceph-deploy-pull-requests.yml | 1 - ceph-docs/config/definitions/ceph-docs.yml | 1 - ceph-next/config/definitions/ceph-next.yml | 1 - ceph-package/config/definitions/ceph-package.yml | 1 - ceph-puppet-modules/config/definitions/ceph-puppet-modules.yml | 1 - .../config/definitions/ceph-qa-suite-pull-requests.yml | 1 - ceph-release-rpm/config/definitions/ceph-release-rpm.yml | 1 - ceph-setup-next/config/definitions/ceph-setup-next.yml | 1 - ceph-setup/config/definitions/ceph-setup.yml | 1 - ceph-tag/config/definitions/ceph-tag.yml | 1 - ceph/config/definitions/ceph.yml | 1 - mariner-installer/config/definitions/mariner-installer.yml | 1 - merfi-pull-requests/config/definitions/merfi-pull-requests.yml | 1 - .../config/definitions/radosgw-agent-pull-requests.yml | 1 - rhcs-installer/config/definitions/rhcs-installer.yml | 1 - takora/config/definitions/takora.yml | 1 - teuthology-docs/config/definitions/teuthology-docs.yml | 1 - .../config/definitions/teuthology-pull-requests.yml | 1 - 39 files changed, 39 deletions(-) diff --git a/calamari-clients-centos/config/definitions/calamari-clients-centos.yml b/calamari-clients-centos/config/definitions/calamari-clients-centos.yml index e0d8f611..c53d3344 100644 --- a/calamari-clients-centos/config/definitions/calamari-clients-centos.yml +++ b/calamari-clients-centos/config/definitions/calamari-clients-centos.yml @@ -9,7 +9,6 @@ target: ${WORKSPACE} which-build: last-successful - shell: !include-raw ../../build/build - concurrent: false description: '' logrotate: artifactDaysToKeep: '-1' diff --git a/calamari-clients-precise-vagrant/config/definitions/calamari-clients-precise-vagrant.yml b/calamari-clients-precise-vagrant/config/definitions/calamari-clients-precise-vagrant.yml index c628363b..1caafd18 100644 --- a/calamari-clients-precise-vagrant/config/definitions/calamari-clients-precise-vagrant.yml +++ b/calamari-clients-precise-vagrant/config/definitions/calamari-clients-precise-vagrant.yml @@ -3,7 +3,6 @@ block-upstream: false builders: - shell: !include-raw ../../build/build - concurrent: false description: '' logrotate: artifactDaysToKeep: '-1' diff --git a/calamari-clients-precise/config/definitions/calamari-clients-precise.yml b/calamari-clients-precise/config/definitions/calamari-clients-precise.yml index ded97465..26c95b76 100644 --- a/calamari-clients-precise/config/definitions/calamari-clients-precise.yml +++ b/calamari-clients-precise/config/definitions/calamari-clients-precise.yml @@ -3,7 +3,6 @@ block-upstream: false builders: - shell: !include-raw ../../build/build - concurrent: false description: '' logrotate: artifactDaysToKeep: '-1' diff --git a/calamari-clients-rhel/config/definitions/calamari-clients-rhel.yml b/calamari-clients-rhel/config/definitions/calamari-clients-rhel.yml index 5c65f9a0..4f95e488 100644 --- a/calamari-clients-rhel/config/definitions/calamari-clients-rhel.yml +++ b/calamari-clients-rhel/config/definitions/calamari-clients-rhel.yml @@ -9,7 +9,6 @@ target: ${WORKSPACE} which-build: last-successful - shell: !include-raw ../../build/build - concurrent: false description: '' logrotate: artifactDaysToKeep: '-1' diff --git a/calamari-clients-rhel7/config/definitions/calamari-clients-rhel7.yml b/calamari-clients-rhel7/config/definitions/calamari-clients-rhel7.yml index 2f850086..3e833a47 100644 --- a/calamari-clients-rhel7/config/definitions/calamari-clients-rhel7.yml +++ b/calamari-clients-rhel7/config/definitions/calamari-clients-rhel7.yml @@ -9,7 +9,6 @@ target: ${WORKSPACE} which-build: last-successful - shell: !include-raw ../../build/build - concurrent: false description: '' logrotate: artifactDaysToKeep: '-1' diff --git a/calamari-clients-trusty/config/definitions/calamari-clients-trusty.yml b/calamari-clients-trusty/config/definitions/calamari-clients-trusty.yml index b097e4b7..807fcc4f 100644 --- a/calamari-clients-trusty/config/definitions/calamari-clients-trusty.yml +++ b/calamari-clients-trusty/config/definitions/calamari-clients-trusty.yml @@ -9,7 +9,6 @@ target: ${WORKSPACE} which-build: last-successful - shell: !include-raw ../../build/build - concurrent: false description: '' logrotate: artifactDaysToKeep: '-1' diff --git a/calamari-clients-vagrant/config/definitions/calamari-clients-vagrant.yml b/calamari-clients-vagrant/config/definitions/calamari-clients-vagrant.yml index beda887b..3c3e8569 100644 --- a/calamari-clients-vagrant/config/definitions/calamari-clients-vagrant.yml +++ b/calamari-clients-vagrant/config/definitions/calamari-clients-vagrant.yml @@ -31,7 +31,6 @@ which-build: last-successful - shell: !include-raw ../../build/build combination-filter: dist != "wheezy" - concurrent: false description: Build all the non-precise distros (which really means "package them") execution-strategy: run-sequentially: false diff --git a/calamari-clients-wheezy/config/definitions/calamari-clients-wheezy.yml b/calamari-clients-wheezy/config/definitions/calamari-clients-wheezy.yml index 35ff017f..cd56dba6 100644 --- a/calamari-clients-wheezy/config/definitions/calamari-clients-wheezy.yml +++ b/calamari-clients-wheezy/config/definitions/calamari-clients-wheezy.yml @@ -9,7 +9,6 @@ target: ${WORKSPACE} which-build: last-successful - shell: !include-raw ../../build/build - concurrent: false description: '' logrotate: artifactDaysToKeep: '-1' diff --git a/calamari-clients/config/definitions/calamari-clients.yml b/calamari-clients/config/definitions/calamari-clients.yml index a5cb6ad0..575f8371 100644 --- a/calamari-clients/config/definitions/calamari-clients.yml +++ b/calamari-clients/config/definitions/calamari-clients.yml @@ -29,7 +29,6 @@ which-build: last-successful - shell: !include-raw ../../build/build combination-filter: dist != "wheezy" - concurrent: false description: 'Build all the non-precise distros (which really means "package them")' execution-strategy: run-sequentially: false diff --git a/calamari-server-centos/config/definitions/calamari-server-centos.yml b/calamari-server-centos/config/definitions/calamari-server-centos.yml index 1be15091..ff51591b 100644 --- a/calamari-server-centos/config/definitions/calamari-server-centos.yml +++ b/calamari-server-centos/config/definitions/calamari-server-centos.yml @@ -3,7 +3,6 @@ block-upstream: false builders: - shell: !include-raw ../../build/build - concurrent: false description: '' logrotate: artifactDaysToKeep: '-1' diff --git a/calamari-server-precise/config/definitions/calamari-server-precise.yml b/calamari-server-precise/config/definitions/calamari-server-precise.yml index 5c4176a2..c6d0104e 100644 --- a/calamari-server-precise/config/definitions/calamari-server-precise.yml +++ b/calamari-server-precise/config/definitions/calamari-server-precise.yml @@ -3,7 +3,6 @@ block-upstream: false builders: - shell: !include-raw ../../build/build - concurrent: false description: '' logrotate: artifactDaysToKeep: '-1' diff --git a/calamari-server-rhel/config/definitions/calamari-server-rhel.yml b/calamari-server-rhel/config/definitions/calamari-server-rhel.yml index 30135c08..657da031 100644 --- a/calamari-server-rhel/config/definitions/calamari-server-rhel.yml +++ b/calamari-server-rhel/config/definitions/calamari-server-rhel.yml @@ -3,7 +3,6 @@ block-upstream: false builders: - shell: !include-raw ../../build/build - concurrent: false description: '' logrotate: artifactDaysToKeep: '-1' diff --git a/calamari-server-rhel7/config/definitions/calamari-server-rhel7.yml b/calamari-server-rhel7/config/definitions/calamari-server-rhel7.yml index dcd6236b..06be515c 100644 --- a/calamari-server-rhel7/config/definitions/calamari-server-rhel7.yml +++ b/calamari-server-rhel7/config/definitions/calamari-server-rhel7.yml @@ -3,7 +3,6 @@ block-upstream: false builders: - shell: !include-raw ../../build/build - concurrent: false description: '' logrotate: artifactDaysToKeep: '-1' diff --git a/calamari-server-trusty/config/definitions/calamari-server-trusty.yml b/calamari-server-trusty/config/definitions/calamari-server-trusty.yml index 48430763..2c160587 100644 --- a/calamari-server-trusty/config/definitions/calamari-server-trusty.yml +++ b/calamari-server-trusty/config/definitions/calamari-server-trusty.yml @@ -3,7 +3,6 @@ block-upstream: false builders: - shell: !include-raw ../../build/build - concurrent: false description: '' logrotate: artifactDaysToKeep: '-1' diff --git a/calamari-server-vagrant/config/definitions/calamari-server-vagrant.yml b/calamari-server-vagrant/config/definitions/calamari-server-vagrant.yml index c58e08b2..953fcc18 100644 --- a/calamari-server-vagrant/config/definitions/calamari-server-vagrant.yml +++ b/calamari-server-vagrant/config/definitions/calamari-server-vagrant.yml @@ -20,7 +20,6 @@ builders: - shell: !include-raw ../../build/build combination-filter: dist != "wheezy" - concurrent: false description: '' execution-strategy: run-sequentially: false diff --git a/calamari-server-wheezy/config/definitions/calamari-server-wheezy.yml b/calamari-server-wheezy/config/definitions/calamari-server-wheezy.yml index 5da0ed4c..ef675b5b 100644 --- a/calamari-server-wheezy/config/definitions/calamari-server-wheezy.yml +++ b/calamari-server-wheezy/config/definitions/calamari-server-wheezy.yml @@ -3,7 +3,6 @@ block-upstream: false builders: - shell: !include-raw ../../build/build - concurrent: false description: '' logrotate: artifactDaysToKeep: '-1' diff --git a/calamari-server/config/definitions/calamari-server.yml b/calamari-server/config/definitions/calamari-server.yml index ed6701c6..9018a130 100644 --- a/calamari-server/config/definitions/calamari-server.yml +++ b/calamari-server/config/definitions/calamari-server.yml @@ -25,7 +25,6 @@ builders: - shell: !include-raw ../../build/build combination-filter: dist != 'wheezy' && dist != 'rhel' - concurrent: false description: '' execution-strategy: run-sequentially: false diff --git a/ceph-build-next/config/definitions/ceph-build-next.yml b/ceph-build-next/config/definitions/ceph-build-next.yml index 2604416c..1a694004 100644 --- a/ceph-build-next/config/definitions/ceph-build-next.yml +++ b/ceph-build-next/config/definitions/ceph-build-next.yml @@ -3,7 +3,6 @@ project-type: matrix defaults: global display-name: 'ceph-build-next' - concurrent: false block-downstream: false block-upstream: false properties: diff --git a/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml b/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml index 0572bb4c..493ca3b7 100644 --- a/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml +++ b/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml @@ -4,7 +4,6 @@ project-type: freestyle defaults: global display-name: 'ceph-build: Pull Requests' - concurrent: false quiet-period: 5 block-downstream: false block-upstream: false diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml index 081b6400..27edb9fc 100644 --- a/ceph-build/config/definitions/ceph-build.yml +++ b/ceph-build/config/definitions/ceph-build.yml @@ -3,7 +3,6 @@ project-type: matrix defaults: global display-name: 'ceph-build' - concurrent: false block-downstream: false block-upstream: false properties: diff --git a/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml b/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml index a4645a17..fcd1d10a 100644 --- a/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml +++ b/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml @@ -4,7 +4,6 @@ project-type: freestyle defaults: global display-name: 'ceph-deploy: docs build' - concurrent: false quiet-period: 5 block-downstream: false block-upstream: false diff --git a/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml b/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml index 24d6e30a..985e12ef 100644 --- a/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml +++ b/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml @@ -33,7 +33,6 @@ project-type: freestyle defaults: global display-name: 'ceph-deploy: Pull Requests' - concurrent: false quiet-period: 5 block-downstream: false block-upstream: false diff --git a/ceph-docs/config/definitions/ceph-docs.yml b/ceph-docs/config/definitions/ceph-docs.yml index 55af7924..30688f3a 100644 --- a/ceph-docs/config/definitions/ceph-docs.yml +++ b/ceph-docs/config/definitions/ceph-docs.yml @@ -3,7 +3,6 @@ node: docs project-type: freestyle defaults: global - concurrent: false quiet-period: 5 block-downstream: false block-upstream: false diff --git a/ceph-next/config/definitions/ceph-next.yml b/ceph-next/config/definitions/ceph-next.yml index 9660d96f..af5081db 100644 --- a/ceph-next/config/definitions/ceph-next.yml +++ b/ceph-next/config/definitions/ceph-next.yml @@ -4,7 +4,6 @@ project-type: multijob defaults: global display-name: 'ceph-next' - concurrent: false logrotate: daysToKeep: -1 numToKeep: 25 diff --git a/ceph-package/config/definitions/ceph-package.yml b/ceph-package/config/definitions/ceph-package.yml index 9db30173..0f357440 100644 --- a/ceph-package/config/definitions/ceph-package.yml +++ b/ceph-package/config/definitions/ceph-package.yml @@ -3,7 +3,6 @@ defaults: global display-name: 'ceph-package' node: package - concurrent: false block-downstream: false block-upstream: false logrotate: diff --git a/ceph-puppet-modules/config/definitions/ceph-puppet-modules.yml b/ceph-puppet-modules/config/definitions/ceph-puppet-modules.yml index 18c746fa..5e27f959 100644 --- a/ceph-puppet-modules/config/definitions/ceph-puppet-modules.yml +++ b/ceph-puppet-modules/config/definitions/ceph-puppet-modules.yml @@ -36,7 +36,6 @@ !include-raw ../../build/rename-ceph-puppet-modules - shell: !include-raw ../../../takora/build/build - concurrent: false parameters: - string: default: master diff --git a/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml b/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml index d6351644..67d2fd58 100644 --- a/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml +++ b/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml @@ -4,7 +4,6 @@ project-type: freestyle defaults: global display-name: 'ceph-qa-suite: Pull Requests' - concurrent: false quiet-period: 5 block-downstream: false block-upstream: false diff --git a/ceph-release-rpm/config/definitions/ceph-release-rpm.yml b/ceph-release-rpm/config/definitions/ceph-release-rpm.yml index 16607051..444c4188 100644 --- a/ceph-release-rpm/config/definitions/ceph-release-rpm.yml +++ b/ceph-release-rpm/config/definitions/ceph-release-rpm.yml @@ -3,7 +3,6 @@ project-type: matrix defaults: global description: Builds the repository configuration package for ceph-release. RPMS Only - concurrent: false block-downstream: false block-upstream: false diff --git a/ceph-setup-next/config/definitions/ceph-setup-next.yml b/ceph-setup-next/config/definitions/ceph-setup-next.yml index 5e55a124..5fa639f4 100644 --- a/ceph-setup-next/config/definitions/ceph-setup-next.yml +++ b/ceph-setup-next/config/definitions/ceph-setup-next.yml @@ -5,7 +5,6 @@ # FIXME: unpin when this gets ported over node: huge && trusty display-name: 'ceph-setup-next' - concurrent: false logrotate: daysToKeep: -1 numToKeep: 25 diff --git a/ceph-setup/config/definitions/ceph-setup.yml b/ceph-setup/config/definitions/ceph-setup.yml index 399319ab..fb3ff2bd 100644 --- a/ceph-setup/config/definitions/ceph-setup.yml +++ b/ceph-setup/config/definitions/ceph-setup.yml @@ -5,7 +5,6 @@ # FIXME: unpin when this gets ported over node: trusty display-name: 'ceph-setup' - concurrent: false logrotate: daysToKeep: -1 numToKeep: 25 diff --git a/ceph-tag/config/definitions/ceph-tag.yml b/ceph-tag/config/definitions/ceph-tag.yml index 5df5a7ad..aea71c72 100644 --- a/ceph-tag/config/definitions/ceph-tag.yml +++ b/ceph-tag/config/definitions/ceph-tag.yml @@ -13,7 +13,6 @@ name: ceph-tag description: "This job clones from upstream Ceph, sets the right version from the tag and pushes changes to ceph-releases" display-name: 'ceph-tag' - concurrent: false logrotate: daysToKeep: -1 numToKeep: 25 diff --git a/ceph/config/definitions/ceph.yml b/ceph/config/definitions/ceph.yml index acf3faba..dc6197a1 100644 --- a/ceph/config/definitions/ceph.yml +++ b/ceph/config/definitions/ceph.yml @@ -4,7 +4,6 @@ project-type: multijob defaults: global display-name: 'ceph' - concurrent: false logrotate: daysToKeep: -1 numToKeep: 25 diff --git a/mariner-installer/config/definitions/mariner-installer.yml b/mariner-installer/config/definitions/mariner-installer.yml index a1cb04d4..255af219 100644 --- a/mariner-installer/config/definitions/mariner-installer.yml +++ b/mariner-installer/config/definitions/mariner-installer.yml @@ -34,7 +34,6 @@ builders: - shell: !include-raw ../../build/build - concurrent: false parameters: - string: default: master diff --git a/merfi-pull-requests/config/definitions/merfi-pull-requests.yml b/merfi-pull-requests/config/definitions/merfi-pull-requests.yml index ce065aa8..f68cc5ac 100644 --- a/merfi-pull-requests/config/definitions/merfi-pull-requests.yml +++ b/merfi-pull-requests/config/definitions/merfi-pull-requests.yml @@ -3,7 +3,6 @@ project-type: freestyle defaults: global display-name: 'Merfi: Pull Requests' - concurrent: false quiet-period: 5 block-downstream: false block-upstream: false diff --git a/radosgw-agent-pull-requests/config/definitions/radosgw-agent-pull-requests.yml b/radosgw-agent-pull-requests/config/definitions/radosgw-agent-pull-requests.yml index 68693191..e814fa13 100644 --- a/radosgw-agent-pull-requests/config/definitions/radosgw-agent-pull-requests.yml +++ b/radosgw-agent-pull-requests/config/definitions/radosgw-agent-pull-requests.yml @@ -4,7 +4,6 @@ project-type: freestyle defaults: global display-name: 'radosgw-agent: Pull Requests' - concurrent: false quiet-period: 5 block-downstream: false block-upstream: false diff --git a/rhcs-installer/config/definitions/rhcs-installer.yml b/rhcs-installer/config/definitions/rhcs-installer.yml index a0b3fdae..c3c45117 100644 --- a/rhcs-installer/config/definitions/rhcs-installer.yml +++ b/rhcs-installer/config/definitions/rhcs-installer.yml @@ -36,7 +36,6 @@ !include-raw ../../build/rename-rhcs-installer - shell: !include-raw ../../../mariner-installer/build/build - concurrent: false parameters: - string: default: master diff --git a/takora/config/definitions/takora.yml b/takora/config/definitions/takora.yml index f30c2ed5..ab5b3f59 100644 --- a/takora/config/definitions/takora.yml +++ b/takora/config/definitions/takora.yml @@ -34,7 +34,6 @@ builders: - shell: !include-raw ../../build/build - concurrent: false parameters: - string: default: master diff --git a/teuthology-docs/config/definitions/teuthology-docs.yml b/teuthology-docs/config/definitions/teuthology-docs.yml index 908fa965..fd5b0b31 100644 --- a/teuthology-docs/config/definitions/teuthology-docs.yml +++ b/teuthology-docs/config/definitions/teuthology-docs.yml @@ -4,7 +4,6 @@ project-type: freestyle defaults: global display-name: 'Teuthology: Docs Build' - concurrent: false quiet-period: 5 block-downstream: false block-upstream: false diff --git a/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml b/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml index a6120a44..7578b5fd 100644 --- a/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml +++ b/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml @@ -4,7 +4,6 @@ project-type: freestyle defaults: global display-name: 'Teuthology: Pull Requests' - concurrent: false quiet-period: 5 block-downstream: false block-upstream: false -- 2.39.5