From 8358323d25830e4f709c384d7cf08158f1fe3c76 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Fri, 15 Dec 2017 13:17:31 +0100 Subject: [PATCH] Use the tempest plugin from openstack/ironic-tempest-plugin Change-Id: I2b74a5bc10e674c04142673b0d011662b979e0e9 --- .../run.yaml | 13 +++---------- zuul.d/legacy-virtualbmc-jobs.yaml | 1 + 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/playbooks/legacy/virtualbmc-tempest-dsvm-ironic-pxe_ipmitool-src/run.yaml b/playbooks/legacy/virtualbmc-tempest-dsvm-ironic-pxe_ipmitool-src/run.yaml index b5bb379..b0ba49e 100644 --- a/playbooks/legacy/virtualbmc-tempest-dsvm-ironic-pxe_ipmitool-src/run.yaml +++ b/playbooks/legacy/virtualbmc-tempest-dsvm-ironic-pxe_ipmitool-src/run.yaml @@ -81,16 +81,8 @@ cmd: | cat << 'EOF' >> ironic-vars-early # use tempest plugin - if [[ "$ZUUL_BRANCH" != "master" ]] ; then - # NOTE(jroll) if this is not a patch against master, then - # fetch master to install the plugin - export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic'" - else - # on master, use the local change, so we can pick up any changes to the plugin - export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic'" - fi - export TEMPEST_CONCURRENCY=1 - + export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'" + export TEMPEST_CONCURRENCY=1 EOF chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' @@ -102,6 +94,7 @@ export PROJECTS="openstack/ironic $PROJECTS" export PROJECTS="openstack/ironic-lib $PROJECTS" export PROJECTS="openstack/ironic-python-agent $PROJECTS" + export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" export PROJECTS="openstack/python-ironicclient $PROJECTS" export PROJECTS="openstack/pyghmi $PROJECTS" export PROJECTS="openstack/virtualbmc $PROJECTS" diff --git a/zuul.d/legacy-virtualbmc-jobs.yaml b/zuul.d/legacy-virtualbmc-jobs.yaml index d7dbef9..64094c1 100644 --- a/zuul.d/legacy-virtualbmc-jobs.yaml +++ b/zuul.d/legacy-virtualbmc-jobs.yaml @@ -13,6 +13,7 @@ - openstack/ironic - openstack/ironic-lib - openstack/ironic-python-agent + - openstack/ironic-tempest-plugin - openstack/pyghmi - openstack/python-ironicclient - openstack/virtualbmc