diff options
| author | John L. Villalovos <john.l.villalovos@intel.com> | 2017-12-14 10:33:36 -0800 |
|---|---|---|
| committer | John L. Villalovos <john.l.villalovos@intel.com> | 2017-12-14 14:58:12 -0800 |
| commit | 0e875a4f922ffb7ed72d3c9b365b43a41d85f3ee (patch) | |
| tree | f5f353b82f57c87921015b1f5030d04eccf50b26 | |
| parent | 096834f09ae5d8cabc8c0b1ccbac271ddb13e2ee (diff) | |
| download | python-ironicclient-0e875a4f922ffb7ed72d3c9b365b43a41d85f3ee.tar.gz | |
Use the tempest plugin from openstack/ironic-tempest-plugin
Use the tempest plugin from openstack/ironic-tempest-plugin as we
have moved the tempest code there. Soon the tempest code will be
deleted from openstack/ironic.
Change-Id: Ia6de0236a2531f7e26cc21a124501296ca23d007
(cherry picked from commit 58a0915416e52fe16a1987a6f7aa6d432479af8b)
| -rw-r--r-- | playbooks/legacy/ironicclient-tempest-dsvm-src/run.yaml | 13 | ||||
| -rw-r--r-- | zuul.d/legacy-ironicclient-jobs.yaml | 1 |
2 files changed, 4 insertions, 10 deletions
diff --git a/playbooks/legacy/ironicclient-tempest-dsvm-src/run.yaml b/playbooks/legacy/ironicclient-tempest-dsvm-src/run.yaml index 84a66b8..a8342ea 100644 --- a/playbooks/legacy/ironicclient-tempest-dsvm-src/run.yaml +++ b/playbooks/legacy/ironicclient-tempest-dsvm-src/run.yaml @@ -72,16 +72,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 }}' @@ -93,6 +85,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-ironicclient-jobs.yaml b/zuul.d/legacy-ironicclient-jobs.yaml index 2e489fc..6981ba1 100644 --- a/zuul.d/legacy-ironicclient-jobs.yaml +++ b/zuul.d/legacy-ironicclient-jobs.yaml @@ -32,6 +32,7 @@ - openstack/ironic - openstack/ironic-lib - openstack/ironic-python-agent + - openstack/ironic-tempest-plugin - openstack/pyghmi - openstack/python-ironicclient - openstack/tempest |