Merge "Add openstack/placement as a required project for neutron-grenade*"
This commit is contained in:
commit
c4b16aa492
12
.zuul.yaml
12
.zuul.yaml
@ -206,6 +206,10 @@
|
|||||||
- 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
|
||||||
|
|
||||||
@ -219,6 +223,10 @@
|
|||||||
- 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
|
||||||
# NOTE(haleyb) revert this as soon as we fix bug 1791989
|
# NOTE(haleyb) revert this as soon as we fix bug 1791989
|
||||||
@ -260,6 +268,10 @@
|
|||||||
- 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,7 +32,9 @@
|
|||||||
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
|
||||||
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 DEVSTACK_GATE_NEUTRON_DVR=1
|
||||||
export BRANCH_OVERRIDE=default
|
export BRANCH_OVERRIDE=default
|
||||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||||
|
@ -31,7 +31,9 @@
|
|||||||
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
|
||||||
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
|
# 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,7 +41,9 @@
|
|||||||
cmd: |
|
cmd: |
|
||||||
set -e
|
set -e
|
||||||
set -x
|
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 PYTHONUNBUFFERED=true
|
||||||
export DEVSTACK_GATE_TEMPEST=1
|
export DEVSTACK_GATE_TEMPEST=1
|
||||||
export DEVSTACK_GATE_GRENADE=pullup
|
export DEVSTACK_GATE_GRENADE=pullup
|
||||||
|
Loading…
Reference in New Issue
Block a user