From b315aa5c054e3e9e1e17a45ea58a04eb47e1f255 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 22 Jan 2018 11:15:57 -0500 Subject: [PATCH] Fix the tempest job Change-Id: I5c513a66f79e261a5bd83bb33dcc1a12ab5dfedc --- .zuul.yaml | 1 + .../run.yaml | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 32bb9f97..61b9fe1d 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -24,6 +24,7 @@ - openstack/ironic - openstack/ironic-lib - openstack/ironic-python-agent + - openstack/ironic-tempest-plugin - openstack/pyghmi - openstack/python-ironicclient - openstack/tempest diff --git a/playbooks/legacy/tempest-devstack-ironic-pxe_ipmitool-pyghmi-src/run.yaml b/playbooks/legacy/tempest-devstack-ironic-pxe_ipmitool-pyghmi-src/run.yaml index ca821a92..e93d1103 100644 --- a/playbooks/legacy/tempest-devstack-ironic-pxe_ipmitool-pyghmi-src/run.yaml +++ b/playbooks/legacy/tempest-devstack-ironic-pxe_ipmitool-pyghmi-src/run.yaml @@ -72,14 +72,7 @@ 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 DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'" export TEMPEST_CONCURRENCY=1 EOF @@ -94,6 +87,7 @@ export PROJECTS="openstack/ironic-lib $PROJECTS" export PROJECTS="openstack/ironic-python-agent $PROJECTS" export PROJECTS="openstack/python-ironicclient $PROJECTS" + export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" export PROJECTS="openstack/pyghmi $PROJECTS" export PROJECTS="openstack/virtualbmc $PROJECTS" export PYTHONUNBUFFERED=true