From fc7b83bbf7d52f8a952c2d923eaeb912e40af0f1 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Tue, 16 Oct 2018 08:59:58 -0400 Subject: Apex: Fix csit deployments for queens With changes to deploy scenario files for gambia, we still need the logic to pull in the right csit-env. That logic broke as it depended on DEPLOY_SCENARIO with the changes to scenario names. This patch fixes it to check openstack version (OS_VERSION) instead. Change-Id: Ie130efd0fc3cb7f09a3fa4e896ad461d24394777 Signed-off-by: Tim Rozet --- jjb/apex/apex-deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index 1bc727d32..4876b8504 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -141,8 +141,8 @@ if [[ "$JOB_NAME" =~ "virtual" ]]; then fi if [[ "$PROMOTE" == "True" || "$CSIT_ENV_FLAG" == "True" ]]; then - if [[ "$DEPLOY_SCENARIO" =~ "queens" ]]; then - CSIT_ENV="csit-queens-environment.yaml" + if [[ "$OS_VERSION" != "master" ]]; then + CSIT_ENV="csit-${OS_VERSION}-environment.yaml" else CSIT_ENV="csit-environment.yaml" fi -- cgit 1.2.3-korg