From 610d019c82eef1783c2cac80bec8d5e0b01adad4 Mon Sep 17 00:00:00 2001 From: Ronelle Landy Date: Tue, 21 Aug 2018 11:13:27 -0400 Subject: [PATCH] Add full path to required projects Reparenting jobs on tripleo-ci-base will fail if we do not define the full path to projects required - in particular, openstack/heat-templates errors out. This review also changes the build-image jobs to use the single-centos-7-node nodeset - removing the usage of a legacy nodeset. Change-Id: I2fbae44e962a86fff55b233e5d12bfb39179ab90 --- zuul.d/base.yaml | 10 +++---- zuul.d/build-image.yaml | 64 ++++++++++++++++++++--------------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index a1099aa58..be5682183 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -58,11 +58,11 @@ # https://review.openstack.org/#/c/523178/ for context unbound_cache_min_ttl: 900 required-projects: - - openstack-infra/devstack-gate - - openstack-infra/tripleo-ci - - openstack/tripleo-quickstart - - openstack/tripleo-quickstart-extras - - openstack/tripleo-upgrade + - git.openstack.org/openstack-infra/devstack-gate + - git.openstack.org/openstack-infra/tripleo-ci + - git.openstack.org/openstack/tripleo-quickstart + - git.openstack.org/openstack/tripleo-quickstart-extras + - git.openstack.org/openstack/tripleo-upgrade irrelevant-files: - ^.*\.md$ - ^.*\.rst$ diff --git a/zuul.d/build-image.yaml b/zuul.d/build-image.yaml index 08c321351..0bd718120 100644 --- a/zuul.d/build-image.yaml +++ b/zuul.d/build-image.yaml @@ -21,19 +21,19 @@ run: playbooks/tripleo-buildimage/run.yaml post-run: playbooks/tripleo-buildimage/post.yaml timeout: 4200 - nodeset: legacy-centos-7 + nodeset: single-centos-7-node required-projects: - - openstack/diskimage-builder - - openstack/heat-agents - - openstack/heat-templates - - openstack/instack-undercloud - - openstack/ironic - - openstack/ironic-python-agent - - openstack/python-tripleoclient - - openstack/tripleo-common - - openstack/tripleo-image-elements - - openstack/tripleo-puppet-elements - - openstack/requirements + - git.openstack.org/openstack/diskimage-builder + - git.openstack.org/openstack/heat-agents + - git.openstack.org/openstack/heat-templates + - git.openstack.org/openstack/instack-undercloud + - git.openstack.org/openstack/ironic + - git.openstack.org/openstack/ironic-python-agent + - git.openstack.org/openstack/python-tripleoclient + - git.openstack.org/openstack/tripleo-common + - git.openstack.org/openstack/tripleo-image-elements + - git.openstack.org/openstack/tripleo-puppet-elements + - git.openstack.org/openstack/requirements vars: tripleo_image_type: ironic-python-agent voting: false @@ -47,17 +47,17 @@ run: playbooks/tripleo-buildimage/run.yaml post-run: playbooks/tripleo-buildimage/post.yaml timeout: 4200 - nodeset: legacy-centos-7 + nodeset: single-centos-7-node required-projects: - - openstack/diskimage-builder - - openstack/heat-agents - - openstack/heat-templates - - openstack/instack-undercloud - - openstack/python-tripleoclient - - openstack/requirements - - openstack/tripleo-common - - openstack/tripleo-image-elements - - openstack/tripleo-puppet-elements + - git.openstack.org/openstack/diskimage-builder + - git.openstack.org/openstack/heat-agents + - git.openstack.org/openstack/heat-templates + - git.openstack.org/openstack/instack-undercloud + - git.openstack.org/openstack/python-tripleoclient + - git.openstack.org/openstack/requirements + - git.openstack.org/openstack/tripleo-common + - git.openstack.org/openstack/tripleo-image-elements + - git.openstack.org/openstack/tripleo-puppet-elements vars: tripleo_image_type: overcloud-full irrelevant-files: @@ -70,17 +70,17 @@ run: playbooks/tripleo-buildimage/run.yaml post-run: playbooks/tripleo-build/post.yaml timeout: 4200 - nodeset: legacy-centos-7 + nodeset: single-centos-7-node required-projects: - - openstack/diskimage-builder - - openstack/heat-agents - - openstack/heat-templates - - openstack/instack-undercloud - - openstack/python-tripleoclient - - openstack/tripleo-common - - openstack/tripleo-image-elements - - openstack/tripleo-puppet-elements - - openstack/requirements + - git.openstack.org/openstack/diskimage-builder + - git.openstack.org/openstack/heat-agents + - git.openstack.org/openstack/heat-templates + - git.openstack.org/openstack/instack-undercloud + - git.openstack.org/openstack/python-tripleoclient + - git.openstack.org/openstack/tripleo-common + - git.openstack.org/openstack/tripleo-image-elements + - git.openstack.org/openstack/tripleo-puppet-elements + - git.openstack.org/openstack/requirements vars: tripleo_image_type: overcloud-hardened-full voting: false