summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-08-10 15:34:39 -0400
committerTim Rozet <trozet@redhat.com>2018-08-10 15:34:39 -0400
commit981cc83cef6c3d58b7df3bccce36cef9d791c11d (patch)
tree0be5f63b23ad04c58aa7145bd986a0de946e4202
parentf00dc471d4ccd9b5b0e06146f09b4546d2ac3133 (diff)
Apex: Allow deploying csit env in verify
This patch allows us to run a gate job against csit environment, by doing something like: start-gate-scenario: os-nosdn-nofeature-noha-csit Change-Id: I3041404cdfdffe159cff33ecd72be93fe9383e10 Signed-off-by: Tim Rozet <trozet@redhat.com>
-rwxr-xr-xjjb/apex/apex-deploy.sh13
1 files changed, 11 insertions, 2 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 7840919..441bf90 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -5,6 +5,7 @@ set -o pipefail
IPV6_FLAG=False
ALLINONE_FLAG=False
+CSIT_ENV_FLAG=False
# log info to console
echo "Starting the Apex deployment."
@@ -106,12 +107,20 @@ if echo ${DEPLOY_SCENARIO} | grep ipv6; then
IPV6_FLAG=True
DEPLOY_SCENARIO=$(echo ${DEPLOY_SCENARIO} | sed 's/-ipv6//')
echo "INFO: IPV6 Enabled"
-elif echo ${DEPLOY_SCENARIO} | grep allinone; then
+fi
+
+if echo ${DEPLOY_SCENARIO} | grep allinone; then
ALLINONE_FLAG=True
DEPLOY_SCENARIO=$(echo ${DEPLOY_SCENARIO} | sed 's/-allinone//')
echo "INFO: All in one deployment detected"
fi
+if echo ${DEPLOY_SCENARIO} | grep csit; then
+ CSIT_ENV_FLAG=True
+ DEPLOY_SCENARIO=$(echo ${DEPLOY_SCENARIO} | sed 's/-csit//')
+ echo "INFO: CSIT env requested in deploy scenario"
+fi
+
echo "Deploy Scenario set to ${DEPLOY_SCENARIO}"
DEPLOY_FILE="${DEPLOY_SETTINGS_DIR}/${DEPLOY_SCENARIO}.yaml"
@@ -131,7 +140,7 @@ if [[ "$JOB_NAME" =~ "virtual" ]]; then
DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 2"
fi
- if [[ "$PROMOTE" == "True" ]]; then
+ if [[ "$PROMOTE" == "True" || "$CSIT_ENV_FLAG" == "True" ]]; then
if [[ "$DEPLOY_SCENARIO" =~ "queens" ]]; then
CSIT_ENV="csit-queens-environment.yaml"
else