summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-10-16 08:59:58 -0400
committerTim Rozet <trozet@redhat.com>2018-10-16 08:59:58 -0400
commitfc7b83bbf7d52f8a952c2d923eaeb912e40af0f1 (patch)
treea7078a0b41c9300fa8ea8851ede56c8f146f7704
parent66a6a17f2e0889f02826a1ffd4d3f150d5c7bbab (diff)
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 <trozet@redhat.com>
-rwxr-xr-xjjb/apex/apex-deploy.sh4
1 files 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