diff options
| author | Matt Riedemann <mriedem.os@gmail.com> | 2018-09-30 11:48:17 -0400 |
|---|---|---|
| committer | Matt Riedemann <mriedem.os@gmail.com> | 2018-09-30 11:48:17 -0400 |
| commit | e1272cb19b2d8d5fc660f3f81de72058c1b96e13 (patch) | |
| tree | 1564237a8f5209b746a0b1ff6363948359d71ac9 | |
| parent | cde14aaf5eef8319e7d32122b19173124e3d82db (diff) | |
| download | ironic-e1272cb19b2d8d5fc660f3f81de72058c1b96e13.tar.gz | |
Add openstack/placement as a required project for ironic-grenade*
In order to get openstack/placement installed as part of the
ironic grenade jobs, we have to list it as a required project.
Needed by https://review.openstack.org/604454/
Change-Id: I3922ef15ef8b4517f653a37ca137ba30c8ca5643
| -rw-r--r-- | playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml | 4 | ||||
| -rw-r--r-- | playbooks/legacy/grenade-dsvm-ironic/run.yaml | 4 | ||||
| -rw-r--r-- | zuul.d/legacy-ironic-jobs.yaml | 8 |
3 files changed, 14 insertions, 2 deletions
diff --git a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml index aefb72b61..6b5c95051 100644 --- a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml @@ -52,7 +52,9 @@ - shell: cmd: | cat << 'EOF' >> ironic-extra-vars - 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_GRENADE=pullup export DEVSTACK_GATE_OS_TEST_TIMEOUT=2400 export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200 diff --git a/playbooks/legacy/grenade-dsvm-ironic/run.yaml b/playbooks/legacy/grenade-dsvm-ironic/run.yaml index 1eef354b8..fd9bb062b 100644 --- a/playbooks/legacy/grenade-dsvm-ironic/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ironic/run.yaml @@ -30,7 +30,9 @@ - shell: cmd: | cat << 'EOF' >> ironic-extra-vars - 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_GRENADE=pullup export DEVSTACK_GATE_OS_TEST_TIMEOUT=2400 export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200 diff --git a/zuul.d/legacy-ironic-jobs.yaml b/zuul.d/legacy-ironic-jobs.yaml index aff811a28..f734e742d 100644 --- a/zuul.d/legacy-ironic-jobs.yaml +++ b/zuul.d/legacy-ironic-jobs.yaml @@ -82,6 +82,10 @@ - openstack/pyghmi - openstack/python-ironicclient - 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: name: ironic-grenade-dsvm-multinode-multitenant @@ -98,6 +102,10 @@ - openstack/pyghmi - openstack/python-ironicclient - 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 - job: |