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 8ecf96e16366348a53cc53aa6a29f4c7f3d83410..7f34bdff59e8e4f86a48935449ef908a069fa87c 100644 (file)
--- 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 a85c3a755520c8b8bf927a9852bc1ada1f252d35..7305a14c0f584df0d415d84139392762a83645c9 100755 (executable)
--- 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 a85c3a755520c8b8bf927a9852bc1ada1f252d35..4ec460376133b0c31cf2ccdc90725021f793e29b 100755 (executable)
--- 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" \