Skip to content

Commit 18db751

Browse files
committed
CI: Fix trunks enabled by default
Cardoe reported that networking-baremetal jobs were failing regardless of the change. Upon investigation, we could see that n-g-s's devstack plugin was automatically turning on the the test feature flag. By default, this should be assumed to be false, and as such the developer has moved to using a setting flag, I'll take a similar approach with the the ngs devstack plugin so we don't inadvertently turn on the feature flag for tempest. see: https://review.opendev.org/c/openstack/ironic/+/940611 Change-Id: I7f80a33382e163478a65e6acb1f478f610f6b488
1 parent 74eef1e commit 18db751

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

devstack/plugin.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,9 @@ function ngs_configure_tempest {
235235
if [ $GENERIC_SWITCH_USER_MAX_SESSIONS -gt 0 ]; then
236236
iniset $TEMPEST_CONFIG ngs port_dlm_concurrency $(($GENERIC_SWITCH_USER_MAX_SESSIONS * 2))
237237
fi
238-
iniset $TEMPEST_CONFIG baremetal_feature_enabled trunks_supported True
238+
if [[ "${ML2_L3_PLUGIN:-}" =~ "trunk" ]]; then
239+
iniset $TEMPEST_CONFIG baremetal_feature_enabled trunks_supported True
240+
fi
239241
}
240242

241243
# check for service enabled

0 commit comments

Comments
 (0)