Merge "zuul: Remove duplicated TEMPEST_PLUGINS entry"
This commit is contained in:
commit
c8c459afdc
@ -101,9 +101,6 @@
|
||||
|
||||
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}
|
||||
if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then
|
||||
# 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"
|
||||
|
||||
# use tempest plugin
|
||||
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
|
||||
# discovery test requires sudo for iptables and virsh
|
||||
|
@ -69,9 +69,6 @@
|
||||
- shell:
|
||||
cmd: |
|
||||
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
|
||||
if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then
|
||||
# discovery test requires sudo for iptables and virsh
|
||||
|
Loading…
x
Reference in New Issue
Block a user