diff --git a/.zuul.yaml b/.zuul.yaml index 40b9688214e..31fc2b68218 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -206,6 +206,10 @@ - openstack-dev/grenade - openstack-infra/devstack-gate - openstack/neutron + # openstack/placement is not part of legacy-dsvm-base because that is + # branchless and openstack/placement only has a master branch (it is + # new as of Stein) + - openstack/placement nodeset: ubuntu-xenial-2-node irrelevant-files: *tempest-irrelevant-files @@ -219,6 +223,10 @@ - openstack-dev/grenade - openstack-infra/devstack-gate - openstack/neutron + # openstack/placement is not part of legacy-dsvm-base because that is + # branchless and openstack/placement only has a master branch (it is + # new as of Stein) + - openstack/placement nodeset: ubuntu-xenial-2-node irrelevant-files: *tempest-irrelevant-files # NOTE(haleyb) revert this as soon as we fix bug 1791989 @@ -260,6 +268,10 @@ - openstack-dev/grenade - openstack-infra/devstack-gate - openstack/neutron + # openstack/placement is not part of legacy-dsvm-base because that is + # branchless and openstack/placement only has a master branch (it is + # new as of Stein) + - openstack/placement irrelevant-files: *tempest-irrelevant-files - job: diff --git a/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml b/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml index 9fb53244628..cf2dbf9a522 100644 --- a/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml +++ b/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml @@ -32,7 +32,9 @@ export DEVSTACK_GATE_CONFIGDRIVE=0 export DEVSTACK_GATE_GRENADE=pullup # Test DVR upgrade on multinode - export PROJECTS="openstack-dev/grenade $PROJECTS" + # Grenade needs to clone the placement repo on the Stein side since + # the repo did not exist in Rocky. + export PROJECTS="openstack-dev/grenade openstack/placement $PROJECTS" export DEVSTACK_GATE_NEUTRON_DVR=1 export BRANCH_OVERRIDE=default if [ "$BRANCH_OVERRIDE" != "default" ] ; then diff --git a/playbooks/legacy/neutron-grenade-multinode/run.yaml b/playbooks/legacy/neutron-grenade-multinode/run.yaml index 0d7814a777b..e29d344071a 100644 --- a/playbooks/legacy/neutron-grenade-multinode/run.yaml +++ b/playbooks/legacy/neutron-grenade-multinode/run.yaml @@ -31,7 +31,9 @@ export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_CONFIGDRIVE=0 export DEVSTACK_GATE_GRENADE=pullup - export PROJECTS="openstack-dev/grenade $PROJECTS" + # Grenade needs to clone the placement repo on the Stein side since + # the repo did not exist in Rocky. + export PROJECTS="openstack-dev/grenade openstack/placement $PROJECTS" # Default to non DVR export DEVSTACK_GATE_NEUTRON_DVR=0 export BRANCH_OVERRIDE=default diff --git a/playbooks/legacy/neutron-grenade/run.yaml b/playbooks/legacy/neutron-grenade/run.yaml index 31701b8cfd0..835dc1e0bfb 100644 --- a/playbooks/legacy/neutron-grenade/run.yaml +++ b/playbooks/legacy/neutron-grenade/run.yaml @@ -41,7 +41,9 @@ cmd: | set -e set -x - export PROJECTS="openstack-dev/grenade $PROJECTS" + # Grenade needs to clone the placement repo on the Stein side since + # the repo did not exist in Rocky. + export PROJECTS="openstack-dev/grenade openstack/placement $PROJECTS" export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_GRENADE=pullup