From e97d8d137624050044dc85dad4aa24d54b757de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Sun, 11 Apr 2021 10:25:02 +0000 Subject: [PATCH] Fix Grenade DSVM Tempest upper constraints The initial source is too early when GRENADE_USE_EXTERNAL_DEVSTACK is False (as, e.g., in DSVM [aka devstack-gate, aka legacy] jobs). The issue was introduced in I66b5d128c3dbe51289410760ea1cbf7f61c55c2f fixing the Tempest upper constraints to be properly pinned. It did not affect Zuul v3 (aka new) jobs. Also, let's only source the one variable that we need rather than the whole file. See https://review.opendev.org/c/openstack/devstack/+/785547 for an example failure. Closes-Bug: #1923343 Change-Id: If5f14654ab9aee2a140bbfb869b50d63cb289fdf --- grenade.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/grenade.sh b/grenade.sh index 85ab97e8..02435e9f 100755 --- a/grenade.sh +++ b/grenade.sh @@ -39,8 +39,6 @@ export DSTOOLS_VERSION=${DSTOOLS_VERSION:-0.4.0} source $GRENADE_DIR/grenaderc source $GRENADE_DIR/inc/bootstrap -source $BASE_DEVSTACK_DIR/stackrc - while getopts bqs:t c; do case $c in b) @@ -292,6 +290,12 @@ if [[ "$RUN_BASE" == "True" ]]; then echo_summary "Running base smoke test" cd $BASE_RELEASE_DIR/tempest + # NOTE(yoctozepto): Grenade does not know about + # TEMPEST_VENV_UPPER_CONSTRAINTS, only DevStack does. + # This sources that one variable from it. + TEMPEST_VENV_UPPER_CONSTRAINTS=$(set +o xtrace && + source $BASE_DEVSTACK_DIR/stackrc && + echo $TEMPEST_VENV_UPPER_CONSTRAINTS) # NOTE(gmann): If gate explicitly set the non master # constraints to use for Tempest venv then use the same # while running the tests too otherwise, it will recreate