Use ironic-tempest-plugin for ansible-deploy job
tempest plugin in ironic tree is about to be removed Change-Id: I6283db5203b28bbb7a8194cbee02c343d4d00a3d
This commit is contained in:
parent
14e71494a3
commit
d5bd360bc6
|
@ -81,15 +81,8 @@
|
||||||
- shell:
|
- shell:
|
||||||
cmd: |
|
cmd: |
|
||||||
cat << 'EOF' >> ironic-vars-early
|
cat << 'EOF' >> ironic-vars-early
|
||||||
# use tempest plugin
|
# use tempest plugin
|
||||||
if [[ "$ZUUL_BRANCH" != "master" ]] ; then
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
|
||||||
# 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 TEMPEST_CONCURRENCY=1
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
@ -106,6 +99,7 @@
|
||||||
export PROJECTS="openstack/python-ironicclient $PROJECTS"
|
export PROJECTS="openstack/python-ironicclient $PROJECTS"
|
||||||
export PROJECTS="openstack/pyghmi $PROJECTS"
|
export PROJECTS="openstack/pyghmi $PROJECTS"
|
||||||
export PROJECTS="openstack/virtualbmc $PROJECTS"
|
export PROJECTS="openstack/virtualbmc $PROJECTS"
|
||||||
|
export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
|
||||||
export PYTHONUNBUFFERED=true
|
export PYTHONUNBUFFERED=true
|
||||||
export DEVSTACK_GATE_TEMPEST=1
|
export DEVSTACK_GATE_TEMPEST=1
|
||||||
export DEVSTACK_GATE_IRONIC=1
|
export DEVSTACK_GATE_IRONIC=1
|
||||||
|
@ -162,7 +156,7 @@
|
||||||
# Pull in the EARLY variables injected by the optional builders
|
# Pull in the EARLY variables injected by the optional builders
|
||||||
source ironic-vars-early
|
source ironic-vars-early
|
||||||
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic /opt/stack/new/ironic"
|
||||||
|
|
||||||
# Ensure the ironic-EXTRA-vars file exists
|
# Ensure the ironic-EXTRA-vars file exists
|
||||||
touch ironic-extra-vars
|
touch ironic-extra-vars
|
||||||
|
|
|
@ -32,3 +32,4 @@
|
||||||
- openstack/python-ironicclient
|
- openstack/python-ironicclient
|
||||||
- openstack/tempest
|
- openstack/tempest
|
||||||
- openstack/virtualbmc
|
- openstack/virtualbmc
|
||||||
|
- openstack/ironic-tempest-plugin
|
||||||
|
|
Loading…
Reference in New Issue