Skip to content

Commit ef35713

Browse files
committed
use fqdn for zuul projects
When setting up a 3pci zuul, there is an edge case where a downstream zuul may already have openstack/foo projects, eg: review.rdoproject.org/openstack/foo. In this case, if openstack projects are not namespaced to include the connection information zuul gets confused and complains. We can avoid this by using the fqdn for git.o.o for devstack jobs and both upstream and downstream zuul will properly use the correct connection. Change-Id: I01419ea9f51ce7491aa319b6240aec9c0d4f2356 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
1 parent c58c5d6 commit ef35713

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

.zuul.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@
103103
job.group-vars.peers, which is what is used by multi node jobs for subnode
104104
nodes (everything but the controller).
105105
required-projects:
106-
- openstack-dev/devstack
106+
- git.openstack.org/openstack-dev/devstack
107107
roles:
108-
- zuul: openstack-infra/devstack-gate
109-
- zuul: openstack-infra/openstack-zuul-jobs
108+
- zuul: git.openstack.org/openstack-infra/devstack-gate
109+
- zuul: git.openstack.org/openstack-infra/openstack-zuul-jobs
110110
vars:
111111
devstack_localrc:
112112
DATABASE_PASSWORD: secretdatabase
@@ -211,7 +211,7 @@
211211
less than the normal minimum set of required-projects.
212212
nodeset: openstack-single-node
213213
required-projects:
214-
- openstack/requirements
214+
- git.openstack.org/openstack/requirements
215215
vars:
216216
devstack_localrc:
217217
# Multinode specific settings
@@ -270,12 +270,12 @@
270270
and extended.
271271
nodeset: openstack-single-node
272272
required-projects:
273-
- openstack/cinder
274-
- openstack/glance
275-
- openstack/keystone
276-
- openstack/neutron
277-
- openstack/nova
278-
- openstack/swift
273+
- git.openstack.org/openstack/cinder
274+
- git.openstack.org/openstack/glance
275+
- git.openstack.org/openstack/keystone
276+
- git.openstack.org/openstack/neutron
277+
- git.openstack.org/openstack/nova
278+
- git.openstack.org/openstack/swift
279279
timeout: 7200
280280
vars:
281281
devstack_localrc:

0 commit comments

Comments
 (0)