Merge "Revert "Add openstack/placement as a required project for ironic-grenade*""
This commit is contained in:
commit
bd2730a431
@ -52,9 +52,7 @@
|
|||||||
- shell:
|
- shell:
|
||||||
cmd: |
|
cmd: |
|
||||||
cat << 'EOF' >> ironic-extra-vars
|
cat << 'EOF' >> ironic-extra-vars
|
||||||
# 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_GRENADE=pullup
|
export DEVSTACK_GATE_GRENADE=pullup
|
||||||
export DEVSTACK_GATE_OS_TEST_TIMEOUT=2400
|
export DEVSTACK_GATE_OS_TEST_TIMEOUT=2400
|
||||||
export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200
|
export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200
|
||||||
|
@ -30,9 +30,7 @@
|
|||||||
- shell:
|
- shell:
|
||||||
cmd: |
|
cmd: |
|
||||||
cat << 'EOF' >> ironic-extra-vars
|
cat << 'EOF' >> ironic-extra-vars
|
||||||
# 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_GRENADE=pullup
|
export DEVSTACK_GATE_GRENADE=pullup
|
||||||
export DEVSTACK_GATE_OS_TEST_TIMEOUT=2400
|
export DEVSTACK_GATE_OS_TEST_TIMEOUT=2400
|
||||||
export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200
|
export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200
|
||||||
|
@ -82,10 +82,6 @@
|
|||||||
- openstack/pyghmi
|
- openstack/pyghmi
|
||||||
- openstack/python-ironicclient
|
- openstack/python-ironicclient
|
||||||
- openstack/virtualbmc
|
- openstack/virtualbmc
|
||||||
# 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
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: ironic-grenade-dsvm-multinode-multitenant
|
name: ironic-grenade-dsvm-multinode-multitenant
|
||||||
@ -102,9 +98,5 @@
|
|||||||
- openstack/pyghmi
|
- openstack/pyghmi
|
||||||
- openstack/python-ironicclient
|
- openstack/python-ironicclient
|
||||||
- openstack/virtualbmc
|
- openstack/virtualbmc
|
||||||
# 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: legacy-ubuntu-xenial-2-node
|
nodeset: legacy-ubuntu-xenial-2-node
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user