Override execution mode variable for test framework

This commit overrides execution mode variable to mode supported by test framework.

Signed-off-by: Prasad Mukhedkar <prasad.mukhedkar@est.tech>
Change-Id: If4000dc4d92f8304adbe4edcc2a55ea0383e1752

diff --git a/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml b/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
index 04799b7736b1131c7e78a9fc4c89a52f21625ec2..e8d2b4abbbbb8710dde1e1f6a87cfb61350bc97a 100644 (file)
--- a/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
@@ -325,7 +325,7 @@
     parameters:
       - string:
           name: EXECUTION_MODE
-          default: 'offline-test'
+          default: '{execution-mode}'
           description: 'Execution mode'
       - string:
           name: TEST_REPO_URL
@@ -367,7 +367,7 @@
     parameters:
       - string:
           name: EXECUTION_MODE
-          default: 'offline-test'
+          default: '{execution-mode}'
           description: 'Execution mode'
       - string:
           name: TEST_REPO_URL

diff --git a/jjb/cloud-infra/scripts/download-xtesting-artifact.sh b/jjb/cloud-infra/scripts/download-xtesting-artifact.sh
index a782907b415d10eaca025a9df9ec5110443428a5..89c664390637a02a2bdf63124f81391f158432d5 100755 (executable)
--- a/jjb/cloud-infra/scripts/download-xtesting-artifact.sh
+++ b/jjb/cloud-infra/scripts/download-xtesting-artifact.sh
@@ -21,6 +21,9 @@
 set -o nounset
 set -o errexit
 
+# NOTE (eprasad) we need to override execution mode variable to mode supported by test framework
+export EXECUTION_MODE=$(echo "$EXECUTION_MODE" | sed 's/deployment/test/g')
+
 if [[ "$EXECUTION_MODE" == "offline-test" ]]; then
   REMOTE_ARTIFACT=$(echo $OFFLINE_XTESTING_FILE | sed 's/.*\///g')
 

diff --git a/jjb/cloud-infra/scripts/xtesting-healthcheck.sh b/jjb/cloud-infra/scripts/xtesting-healthcheck.sh
index ad46583ed103013a285a2b38c527dba3e4659887..b480989bb35718803b3b8889d4046170b9d83963 100755 (executable)
--- a/jjb/cloud-infra/scripts/xtesting-healthcheck.sh
+++ b/jjb/cloud-infra/scripts/xtesting-healthcheck.sh
@@ -21,6 +21,9 @@
 set -o errexit
 set -o pipefail
 
+# NOTE (eprasad) we need to override execution mode variable to mode supported by test framework
+export EXECUTION_MODE=$(echo "$EXECUTION_MODE" | sed 's/deployment/test/g')
+
 echo "Info  : Cloning infra/test repository"
 cd $HOME && /bin/rm -rf $WORKSPACE
 git clone -q $TEST_REPO_URL $WORKSPACE

diff --git a/jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh b/jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh
index ad46583ed103013a285a2b38c527dba3e4659887..b480989bb35718803b3b8889d4046170b9d83963 100755 (executable)
--- a/jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh
+++ b/jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh
@@ -21,6 +21,9 @@
 set -o errexit
 set -o pipefail
 
+# NOTE (eprasad) we need to override execution mode variable to mode supported by test framework
+export EXECUTION_MODE=$(echo "$EXECUTION_MODE" | sed 's/deployment/test/g')
+
 echo "Info  : Cloning infra/test repository"
 cd $HOME && /bin/rm -rf $WORKSPACE
 git clone -q $TEST_REPO_URL $WORKSPACE