Skip to content

Commit b719b55

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "Ensure testing configuration can run as late as possible"
2 parents 98f2caf + 5c39154 commit b719b55

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

‎extras.d/80-tempest.sh‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@ if is_service_enabled tempest; then
1111
# Tempest config must come after layer 2 services are running
1212
:
1313
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
14+
# Tempest config must come after all other plugins are run
15+
:
16+
elif [[ "$1" == "stack" && "$2" == "post-extra" ]]; then
17+
# local.conf Tempest option overrides
18+
:
19+
elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
1420
echo_summary "Initializing Tempest"
1521
configure_tempest
1622
echo_summary "Installing Tempest Plugins"
1723
install_tempest_plugins
18-
elif [[ "$1" == "stack" && "$2" == "post-extra" ]]; then
19-
# local.conf Tempest option overrides
20-
:
2124
fi
2225

2326
if [[ "$1" == "unstack" ]]; then

0 commit comments

Comments
 (0)