From 3042198b0c5af96df5872f6eb3e9e116f7170264 Mon Sep 17 00:00:00 2001 From: Prasad Mukhedkar Date: Wed, 17 Mar 2021 20:31:52 +0100 Subject: [PATCH] Override execution mode variable for test framework This commit overrides execution mode variable to mode supported by test framework. Signed-off-by: Prasad Mukhedkar Change-Id: If4000dc4d92f8304adbe4edcc2a55ea0383e1752 --- jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml | 4 ++-- jjb/cloud-infra/scripts/download-xtesting-artifact.sh | 3 +++ jjb/cloud-infra/scripts/xtesting-healthcheck.sh | 3 +++ jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) 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 04799b77..e8d2b4ab 100644 --- 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 a782907b..89c66439 100755 --- 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 ad46583e..b480989b 100755 --- 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 ad46583e..b480989b 100755 --- 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 -- 2.25.1