zuul: Remove duplicated TEMPEST_PLUGINS entry
We don't need to have two TEMPEST_PLUGINS entry of the same value of /opt/stack/new/ironic-tempest-plugin. One is enough. Change-Id: I7d91b28d32e42acab91c4bcef42d46e2dfac9094
This commit is contained in:
parent
d5f91618f4
commit
978d5d30dc
|
@ -101,9 +101,6 @@
|
||||||
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector"
|
||||||
|
|
||||||
# use tempest plugin
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
|
|
||||||
|
|
||||||
export IRONIC_INSPECTOR_AUTO_DISCOVERY={inspector-auto-discovery}
|
export IRONIC_INSPECTOR_AUTO_DISCOVERY={inspector-auto-discovery}
|
||||||
if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then
|
if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then
|
||||||
# discovery test requires sudo for iptables and virsh
|
# discovery test requires sudo for iptables and virsh
|
||||||
|
|
|
@ -68,9 +68,6 @@
|
||||||
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector"
|
||||||
|
|
||||||
# use tempest plugin
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
|
|
||||||
|
|
||||||
export IRONIC_INSPECTOR_AUTO_DISCOVERY=1
|
export IRONIC_INSPECTOR_AUTO_DISCOVERY=1
|
||||||
if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then
|
if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then
|
||||||
# discovery test requires sudo for iptables and virsh
|
# discovery test requires sudo for iptables and virsh
|
||||||
|
|
|
@ -69,9 +69,6 @@
|
||||||
- shell:
|
- shell:
|
||||||
cmd: |
|
cmd: |
|
||||||
cat << 'EOF' >> ironic-extra-vars
|
cat << 'EOF' >> ironic-extra-vars
|
||||||
# use tempest plugin
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
|
|
||||||
|
|
||||||
export IRONIC_INSPECTOR_AUTO_DISCOVERY=1
|
export IRONIC_INSPECTOR_AUTO_DISCOVERY=1
|
||||||
if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then
|
if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then
|
||||||
# discovery test requires sudo for iptables and virsh
|
# discovery test requires sudo for iptables and virsh
|
||||||
|
|
Loading…
Reference in New Issue