From 351ad324b31849c14472225446af9ad492e3a0bb Mon Sep 17 00:00:00 2001 From: David Moreau-Simard Date: Thu, 28 Sep 2017 16:42:47 -0400 Subject: [PATCH] Use proper nodesets for the different TripleO OVB jobs The tripleo-centos-7 image is used to direct jobs towards the TripleO RH1 nodepool provider for jobs that require to run there. We also missed a multi node fix from the previous nodeset fixes [1], it's fixed here. [1]: https://review.openstack.org/#/c/508292/ Change-Id: I47aad96a69fcf1674246f1558155819198d07c80 --- zuul.d/zuul-legacy-jobs.yaml | 44 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index 5241a216..b96f6f80 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -8435,7 +8435,7 @@ run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024/run post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -8485,7 +8485,7 @@ run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-fakeha-caserver/run post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-fakeha-caserver/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -8535,7 +8535,7 @@ run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-ha-newton-oooq/run post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-ha-newton-oooq/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -8585,7 +8585,7 @@ run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-ha-ocata-oooq/run post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-ha-ocata-oooq/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -8635,7 +8635,7 @@ run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-ha-oooq/run post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-ha-oooq/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -8685,7 +8685,7 @@ run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-ha-pike-oooq/run post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-ha-pike-oooq/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -8735,7 +8735,7 @@ run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-nonha-containers/run post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-nonha-containers/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -8785,7 +8785,7 @@ run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-nonha-tempest-oooq-master/run post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-nonha-tempest-oooq-master/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -8836,7 +8836,7 @@ run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-nonha-tempest-oooq-ocata/run post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-nonha-tempest-oooq-ocata/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -8887,7 +8887,7 @@ run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-nonha-tempest-oooq-pike/run post-run: playbooks/legacy/periodic-tripleo-ci-centos-7-ovb-nonha-tempest-oooq-pike/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -15173,7 +15173,7 @@ run: playbooks/legacy/tripleo-ci-centos-7-multinode-upgrades/run post-run: playbooks/legacy/tripleo-ci-centos-7-multinode-upgrades/post timeout: 10800 - nodeset: centos-7 + nodeset: centos-7-2-node required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -15290,7 +15290,7 @@ run: playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024/run post-run: playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -15340,7 +15340,7 @@ run: playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton/run post-run: playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -15390,7 +15390,7 @@ run: playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata/run post-run: playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -15440,7 +15440,7 @@ run: playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-pike/run post-run: playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-pike/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -15490,7 +15490,7 @@ run: playbooks/legacy/tripleo-ci-centos-7-ovb-containers-oooq/run post-run: playbooks/legacy/tripleo-ci-centos-7-ovb-containers-oooq/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -15540,7 +15540,7 @@ run: playbooks/legacy/tripleo-ci-centos-7-ovb-convergence-oooq/run post-run: playbooks/legacy/tripleo-ci-centos-7-ovb-convergence-oooq/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -15590,7 +15590,7 @@ run: playbooks/legacy/tripleo-ci-centos-7-ovb-fakeha-caserver/run post-run: playbooks/legacy/tripleo-ci-centos-7-ovb-fakeha-caserver/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -15648,7 +15648,7 @@ run: playbooks/legacy/tripleo-ci-centos-7-ovb-ha-oooq/run post-run: playbooks/legacy/tripleo-ci-centos-7-ovb-ha-oooq/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -15706,7 +15706,7 @@ run: playbooks/legacy/tripleo-ci-centos-7-ovb-ha-oooq-newton/run post-run: playbooks/legacy/tripleo-ci-centos-7-ovb-ha-oooq-newton/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -15756,7 +15756,7 @@ run: playbooks/legacy/tripleo-ci-centos-7-ovb-ha-oooq-ocata/run post-run: playbooks/legacy/tripleo-ci-centos-7-ovb-ha-oooq-ocata/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci @@ -15806,7 +15806,7 @@ run: playbooks/legacy/tripleo-ci-centos-7-ovb-ha-oooq-pike/run post-run: playbooks/legacy/tripleo-ci-centos-7-ovb-ha-oooq-pike/post timeout: 10800 - nodeset: centos-7 + nodeset: tripleo-centos-7 required-projects: - openstack-infra/devstack-gate - openstack-infra/tripleo-ci