From a98766d758fbf828ebd9ba0916f61f7ac1acde43 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Wed, 24 Oct 2018 08:45:23 -0400 Subject: [PATCH] Revert "Add openstack/placement as a required project for neutron-grenade*" This reverts commit 0014c0c3734e8d344e4a45e127fbd0c86dcfaf3c. This is handled generically now with this change and its dependency: https://review.openstack.org/#/c/606853/ Change-Id: I360211cf60afb5611fb9e77fe6332fa59159708f --- .zuul.yaml | 12 ------------ .../legacy/neutron-grenade-dvr-multinode/run.yaml | 4 +--- playbooks/legacy/neutron-grenade-multinode/run.yaml | 4 +--- playbooks/legacy/neutron-grenade/run.yaml | 4 +--- 4 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 67454642b26..22b2c51a6b4 100644 --- a/.zuul.yaml +++ b/.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: diff --git a/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml b/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml index cf2dbf9a522..9fb53244628 100644 --- a/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml +++ b/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 - # the repo did not exist in Rocky. - export PROJECTS="openstack-dev/grenade openstack/placement $PROJECTS" + export PROJECTS="openstack-dev/grenade $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 e29d344071a..0d7814a777b 100644 --- a/playbooks/legacy/neutron-grenade-multinode/run.yaml +++ b/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 - # the repo did not exist in Rocky. - export PROJECTS="openstack-dev/grenade openstack/placement $PROJECTS" + export PROJECTS="openstack-dev/grenade $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 835dc1e0bfb..31701b8cfd0 100644 --- a/playbooks/legacy/neutron-grenade/run.yaml +++ b/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 - # the repo did not exist in Rocky. - export PROJECTS="openstack-dev/grenade openstack/placement $PROJECTS" + export PROJECTS="openstack-dev/grenade $PROJECTS" export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_GRENADE=pullup