Merge "Revert "Add openstack/placement as a required project for neutron-grenade*""

.zuul.yaml

@@ -205,10 +205,6 @@
       - 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
 
@@ -222,10 +218,6 @@
       - 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
 
@@ -265,10 +257,6 @@
       - 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:

playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml

@@ -32,9 +32,7 @@
           export DEVSTACK_GATE_CONFIGDRIVE=0
           export DEVSTACK_GATE_GRENADE=pullup
           # Test DVR upgrade on multinode
-          # Grenade needs to clone the placement repo on the Stein side since
+          export PROJECTS="openstack-dev/grenade $PROJECTS"
-          # 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

playbooks/legacy/neutron-grenade-multinode/run.yaml

@@ -31,9 +31,7 @@
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_CONFIGDRIVE=0
           export DEVSTACK_GATE_GRENADE=pullup
-          # Grenade needs to clone the placement repo on the Stein side since
+          export PROJECTS="openstack-dev/grenade $PROJECTS"
-          # 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

playbooks/legacy/neutron-grenade/run.yaml

@@ -41,9 +41,7 @@
         cmd: |
           set -e
           set -x
-          # Grenade needs to clone the placement repo on the Stein side since
+          export PROJECTS="openstack-dev/grenade $PROJECTS"
-          # 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