Revert "Add openstack/placement as a required project for neutron-grenade*"
This reverts commit 0014c0c373
.
This is handled generically now with this change and its dependency:
https://review.openstack.org/#/c/606853/
Change-Id: I360211cf60afb5611fb9e77fe6332fa59159708f
This commit is contained in:
12
.zuul.yaml
12
.zuul.yaml
@@ -205,10 +205,6 @@
|
|||||||
- openstack-dev/grenade
|
- openstack-dev/grenade
|
||||||
- openstack-infra/devstack-gate
|
- openstack-infra/devstack-gate
|
||||||
- openstack/neutron
|
- 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
|
nodeset: ubuntu-xenial-2-node
|
||||||
irrelevant-files: *tempest-irrelevant-files
|
irrelevant-files: *tempest-irrelevant-files
|
||||||
|
|
||||||
@@ -222,10 +218,6 @@
|
|||||||
- openstack-dev/grenade
|
- openstack-dev/grenade
|
||||||
- openstack-infra/devstack-gate
|
- openstack-infra/devstack-gate
|
||||||
- openstack/neutron
|
- 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
|
nodeset: ubuntu-xenial-2-node
|
||||||
irrelevant-files: *tempest-irrelevant-files
|
irrelevant-files: *tempest-irrelevant-files
|
||||||
|
|
||||||
@@ -265,10 +257,6 @@
|
|||||||
- openstack-dev/grenade
|
- openstack-dev/grenade
|
||||||
- openstack-infra/devstack-gate
|
- openstack-infra/devstack-gate
|
||||||
- openstack/neutron
|
- 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
|
irrelevant-files: *tempest-irrelevant-files
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
|
@@ -32,9 +32,7 @@
|
|||||||
export DEVSTACK_GATE_CONFIGDRIVE=0
|
export DEVSTACK_GATE_CONFIGDRIVE=0
|
||||||
export DEVSTACK_GATE_GRENADE=pullup
|
export DEVSTACK_GATE_GRENADE=pullup
|
||||||
# Test DVR upgrade on multinode
|
# 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 DEVSTACK_GATE_NEUTRON_DVR=1
|
||||||
export BRANCH_OVERRIDE=default
|
export BRANCH_OVERRIDE=default
|
||||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||||
|
@@ -31,9 +31,7 @@
|
|||||||
export DEVSTACK_GATE_NEUTRON=1
|
export DEVSTACK_GATE_NEUTRON=1
|
||||||
export DEVSTACK_GATE_CONFIGDRIVE=0
|
export DEVSTACK_GATE_CONFIGDRIVE=0
|
||||||
export DEVSTACK_GATE_GRENADE=pullup
|
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
|
# Default to non DVR
|
||||||
export DEVSTACK_GATE_NEUTRON_DVR=0
|
export DEVSTACK_GATE_NEUTRON_DVR=0
|
||||||
export BRANCH_OVERRIDE=default
|
export BRANCH_OVERRIDE=default
|
||||||
|
@@ -41,9 +41,7 @@
|
|||||||
cmd: |
|
cmd: |
|
||||||
set -e
|
set -e
|
||||||
set -x
|
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 PYTHONUNBUFFERED=true
|
||||||
export DEVSTACK_GATE_TEMPEST=1
|
export DEVSTACK_GATE_TEMPEST=1
|
||||||
export DEVSTACK_GATE_GRENADE=pullup
|
export DEVSTACK_GATE_GRENADE=pullup
|
||||||
|
Reference in New Issue
Block a user