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>
This commit is contained in:
parent
c58c5d60ce
commit
ef3571338a
20
.zuul.yaml
20
.zuul.yaml
@ -103,10 +103,10 @@
|
||||
job.group-vars.peers, which is what is used by multi node jobs for subnode
|
||||
nodes (everything but the controller).
|
||||
required-projects:
|
||||
- openstack-dev/devstack
|
||||
- git.openstack.org/openstack-dev/devstack
|
||||
roles:
|
||||
- zuul: openstack-infra/devstack-gate
|
||||
- zuul: openstack-infra/openstack-zuul-jobs
|
||||
- zuul: git.openstack.org/openstack-infra/devstack-gate
|
||||
- zuul: git.openstack.org/openstack-infra/openstack-zuul-jobs
|
||||
vars:
|
||||
devstack_localrc:
|
||||
DATABASE_PASSWORD: secretdatabase
|
||||
@ -211,7 +211,7 @@
|
||||
less than the normal minimum set of required-projects.
|
||||
nodeset: openstack-single-node
|
||||
required-projects:
|
||||
- openstack/requirements
|
||||
- git.openstack.org/openstack/requirements
|
||||
vars:
|
||||
devstack_localrc:
|
||||
# Multinode specific settings
|
||||
@ -270,12 +270,12 @@
|
||||
and extended.
|
||||
nodeset: openstack-single-node
|
||||
required-projects:
|
||||
- openstack/cinder
|
||||
- openstack/glance
|
||||
- openstack/keystone
|
||||
- openstack/neutron
|
||||
- openstack/nova
|
||||
- openstack/swift
|
||||
- git.openstack.org/openstack/cinder
|
||||
- git.openstack.org/openstack/glance
|
||||
- git.openstack.org/openstack/keystone
|
||||
- git.openstack.org/openstack/neutron
|
||||
- git.openstack.org/openstack/nova
|
||||
- git.openstack.org/openstack/swift
|
||||
timeout: 7200
|
||||
vars:
|
||||
devstack_localrc:
|
||||
|
Loading…
Reference in New Issue
Block a user