diff options
| -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, 2 insertions, 14 deletions
diff --git a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml index 6b5c95051..aefb72b61 100644 --- a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml @@ -52,9 +52,7 @@ - shell: cmd: | cat << 'EOF' >> ironic-extra-vars - # 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_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 fd9bb062b..1eef354b8 100644 --- a/playbooks/legacy/grenade-dsvm-ironic/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ironic/run.yaml @@ -30,9 +30,7 @@ - shell: cmd: | cat << 'EOF' >> ironic-extra-vars - # 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_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 f2caee4fd..83d518945 100644 --- a/zuul.d/legacy-ironic-jobs.yaml +++ b/zuul.d/legacy-ironic-jobs.yaml @@ -82,10 +82,6 @@ - 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 @@ -102,9 +98,5 @@ - 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 |