commit e7552c998ac17b47e63979d3c6008f8570b4e04d Author: Zuul Date: Tue Oct 13 10:22:08 2020 +0000 Update git submodules * Update devstack from branch 'master' - Merge "Fix: do not lose the tox_environment value in func tests" - Fix: do not lose the tox_environment value in func tests The current code always overrides tox_environment when running functional tests, but the correct behavior is to add the discovered environment variables to tox_environments, while keeping the user-specified value for it. The current behavior breaks the devstack-tox-functional children jobs, like openstacksdk-functional-devstack-ironic, which set tox_environment. Change-Id: I5dc9054a1495ca0ef7745c08316441ab153956f4 diff --git a/devstack b/devstack index 48bc092..6e68add 160000 --- a/devstack +++ b/devstack @@ -1 +1 @@ -Subproject commit 48bc0924cf759ae5201db2edf25d7e88c90d4f25 +Subproject commit 6e68add2758d5a07c96188da7c3c75671a2dad8e