From: eprasad <prasad.mukhedkar@est.tech>
Date: Thu, 28 Jan 2021 05:56:09 +0000 (+0000)
Subject: Set stack_type in parameters
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=26a5f16dbc5fdd8e213a33ea863df059a64d0149;p=infra%2Fcicd.git

Set stack_type in parameters

This adds STACK_TYPE variable in the job parameters and put testing
in online execution mode.

Signed-off-by: eprasad <prasad.mukhedkar@est.tech>
Change-Id: Iabadbf9685ee8177726f428283664ee42d5572bf
---

diff --git a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
index 8ecf96e16..7f34bdff5 100644
--- a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
@@ -126,6 +126,10 @@
           name: EXECUTION_MODE
           default: '{execution-mode}'
           description: 'Execution mode to run in'
+      - string:
+         name: STACK_TYPE
+         default: 'onap'
+         description: 'Stack to package, deploy, test, release'
       - string:
           name: PDF
           default: '{pdf}'
diff --git a/jjb/cloud-infra/scripts/xtesting-healthcheck.sh b/jjb/cloud-infra/scripts/xtesting-healthcheck.sh
index a85c3a755..7305a14c0 100755
--- a/jjb/cloud-infra/scripts/xtesting-healthcheck.sh
+++ b/jjb/cloud-infra/scripts/xtesting-healthcheck.sh
@@ -25,12 +25,8 @@ echo "Info  : Cloning infra/test repository"
 cd $HOME && /bin/rm -rf $WORKSPACE
 git clone -q $TEST_REPO_URL $WORKSPACE
 
-# NOTE (eprasad): we need to override execution mode variable coming from change.properties file
-if [[ "$CI_LOOP" != "release" ]]; then
-  export EXECUTION_MODE=$(echo "$EXECUTION_MODE" | sed 's/deployment/test/g')
-else
-  export EXECUTION_MODE=online-test
-fi
+# Note (eprasad): Set execution mode
+export EXECUTION_MODE=online-test
 
 cd $WORKSPACE/test
 ./test.sh -s "$STACK_TYPE" -b "$BRANCH" -c "$DEPLOY_SCENARIO" -f "$TEST_FW" -t "$TEST_SUITE" \
diff --git a/jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh b/jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh
index a85c3a755..4ec460376 100755
--- a/jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh
+++ b/jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh
@@ -25,12 +25,10 @@ echo "Info  : Cloning infra/test repository"
 cd $HOME && /bin/rm -rf $WORKSPACE
 git clone -q $TEST_REPO_URL $WORKSPACE
 
-# NOTE (eprasad): we need to override execution mode variable coming from change.properties file
-if [[ "$CI_LOOP" != "release" ]]; then
-  export EXECUTION_MODE=$(echo "$EXECUTION_MODE" | sed 's/deployment/test/g')
-else
-  export EXECUTION_MODE=online-test
-fi
+
+# Note (eprasad): Set execution mode
+export EXECUTION_MODE=online-test
+
 
 cd $WORKSPACE/test
 ./test.sh -s "$STACK_TYPE" -b "$BRANCH" -c "$DEPLOY_SCENARIO" -f "$TEST_FW" -t "$TEST_SUITE" \