From af4844b31a2cdcb108d17d290585599156d29907 Mon Sep 17 00:00:00 2001
From: Akash Rajguru <akash.rajguru@est.tech>
Date: Mon, 16 Aug 2021 12:15:30 +0100
Subject: [PATCH] AEGIS-455: Updated onap-verfiy-deploy jjb job template       
      * xTesting for infra-healthcheck and healthcheck use change.properties 
     * download-xtesting-artifact-macro for downloading atrifact from nordix
 artifactory. Change-Id: If5b4a58f3723dde01ae25cb788ea97a900b874ec

---
 jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml | 2 ++
 jjb/cloud-infra/scripts/xtesting-healthcheck.sh        | 5 +----
 jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh  | 5 +----
 3 files changed, 4 insertions(+), 8 deletions(-)

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 a9555d6c..6caf4e9b 100644
--- a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
@@ -294,6 +294,7 @@
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: false
+              property-file: $WORKSPACE/change.properties
             - name: 'onap-verify-{environment-type}-xtesting-healthcheck-{distro}-{cloud}-{type}-{stream}'
               current-parameters: true
               git-revision: true
@@ -433,6 +434,7 @@
       - fix-workspace-permissions
 
     builders:
+      - 'download-xtesting-artifact-macro'
       - 'xtesting-infra-healthcheck-macro'
 
 - job-template:
diff --git a/jjb/cloud-infra/scripts/xtesting-healthcheck.sh b/jjb/cloud-infra/scripts/xtesting-healthcheck.sh
index 82eb1808..5b63fa26 100755
--- a/jjb/cloud-infra/scripts/xtesting-healthcheck.sh
+++ b/jjb/cloud-infra/scripts/xtesting-healthcheck.sh
@@ -25,10 +25,7 @@ set -o pipefail
 export EXECUTION_MODE=$(echo "$EXECUTION_MODE" | sed 's/deployment/test/g')
 
 if [[ "$EXECUTION_MODE" == "offline-test" ]]; then
-  # TEST_ROOT_DIR="/opt/test/offline/git/test"
-  echo "Info  : Testing of offline deployments is not currently supported! switching to online mode"
-  export EXECUTION_MODE=$(echo "$EXECUTION_MODE" | sed 's/offline/online/g')
-  TEST_ROOT_DIR="$WORKSPACE"
+  TEST_ROOT_DIR="/opt/test/offline/git/test"
 else
   TEST_ROOT_DIR="$WORKSPACE"
 fi
diff --git a/jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh b/jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh
index 82eb1808..5b63fa26 100755
--- a/jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh
+++ b/jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh
@@ -25,10 +25,7 @@ set -o pipefail
 export EXECUTION_MODE=$(echo "$EXECUTION_MODE" | sed 's/deployment/test/g')
 
 if [[ "$EXECUTION_MODE" == "offline-test" ]]; then
-  # TEST_ROOT_DIR="/opt/test/offline/git/test"
-  echo "Info  : Testing of offline deployments is not currently supported! switching to online mode"
-  export EXECUTION_MODE=$(echo "$EXECUTION_MODE" | sed 's/offline/online/g')
-  TEST_ROOT_DIR="$WORKSPACE"
+  TEST_ROOT_DIR="/opt/test/offline/git/test"
 else
   TEST_ROOT_DIR="$WORKSPACE"
 fi
-- 
2.25.1