Use the tempest plugin from openstack/ironic-tempest-plugin
Follow-on patch will delete the openstack/ironic-inspector/ironic_inspector/test/inspector_tempest_plugin/ directory. But this will need to be done after this patch has been backported to the stable branches, otherwise the stable branches will break. Change-Id: I94b74aa83e6898a11f6b81862325cee395a0fd3e Depends-On: I4fb07ecad151421f2aa132394e048a9fce67f7b4
This commit is contained in:
parent
b81c142824
commit
dcd1882c2f
|
@ -86,16 +86,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 }}'
|
||||
|
@ -110,14 +102,7 @@
|
|||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector"
|
||||
|
||||
# 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-inspector'"
|
||||
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-inspector'"
|
||||
fi
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
|
||||
|
||||
export IRONIC_INSPECTOR_AUTO_DISCOVERY={inspector-auto-discovery}
|
||||
if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then
|
||||
|
@ -146,6 +131,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"
|
||||
|
|
|
@ -69,14 +69,7 @@
|
|||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector"
|
||||
|
||||
# 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-inspector'"
|
||||
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-inspector'"
|
||||
fi
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
|
||||
|
||||
export IRONIC_INSPECTOR_AUTO_DISCOVERY=1
|
||||
if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then
|
||||
|
@ -102,16 +95,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 }}'
|
||||
|
@ -123,6 +108,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"
|
||||
|
|
|
@ -60,15 +60,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 }}'
|
||||
|
@ -77,14 +70,7 @@
|
|||
cmd: |
|
||||
cat << 'EOF' >> ironic-extra-vars
|
||||
# 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-inspector'"
|
||||
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-inspector'"
|
||||
fi
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
|
||||
|
||||
export IRONIC_INSPECTOR_AUTO_DISCOVERY=1
|
||||
if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then
|
||||
|
@ -118,6 +104,7 @@
|
|||
fi
|
||||
|
||||
export PROJECTS="openstack/ironic openstack/ironic-inspector $PROJECTS"
|
||||
export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin ironic git://git.openstack.org/openstack/ironic"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector https://git.openstack.org/openstack/ironic-inspector"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_AUTOMATED_CLEAN_ENABLED=False"
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
- openstack/ironic-inspector
|
||||
- openstack/ironic-lib
|
||||
- openstack/ironic-python-agent
|
||||
- openstack/ironic-tempest-plugin
|
||||
- openstack/pyghmi
|
||||
- openstack/python-ironic-inspector-client
|
||||
- openstack/python-ironicclient
|
||||
|
|
Loading…
Reference in New Issue