From 8f1bcbaf840297430a95637449598e7de405289e Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Wed, 8 Apr 2020 12:06:06 -0500 Subject: [PATCH] Fix Tempest installtion on system wide for stable branch INSTALL_TEMPEST flag enable to install Tempest by default on devstack env which is meant for using on master gate only and has to be false for stable branch. On stable branch master Tempest on system wide can fail to install for various reason like constraint etc. That is why we install Tempest on venv always. This started failing the py2 jobs on stable/train gate[1] where heat devstack plugin try to install Tempest on system wide also which try to use py2 env (Tempest is py3 only now) because jobs is py2 and fail. We need to set up the Tempest on system wide based on INSTALL_TEMPEST flag which is set to false on all stable branch to: - https://review.opendev.org/#/q/I60949fb735c82959fb2cfcb6aeef9e33fb0445b6 [1] https://zuul.opendev.org/t/openstack/build/398d906e73724ee6b91d8f32babc5035/log/logs/devstacklog.txt#37969 - https://review.opendev.org/#/c/717428/ - https://review.opendev.org/#/c/717529/ Change-Id: I13153881223c3a585052a94651b9ff082a75b283 --- devstack/plugin.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index ae919b6bb5..6e1d0ae099 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -18,7 +18,9 @@ if is_heat_enabled; then elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then if is_service_enabled tempest; then - setup_develop $TEMPEST_DIR + if [[ "$INSTALL_TEMPEST" == "True" ]]; then + setup_develop $TEMPEST_DIR + fi fi elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then