From d7784f580eb600a2ebb377dddbeaafcb24239441 Mon Sep 17 00:00:00 2001
From: Akash Rajguru <akash.rajguru@est.tech>
Date: Mon, 28 Jun 2021 15:32:52 +0100
Subject: [PATCH] AEGIS-455: Updated builders for xtesting in
 onap-verify-deploy-test                * Update xtesting-healthcheck.sh and
 xtesting-infra-healthcheck.sh                * to switch to online in offline
 xtesting

Change-Id: If9aeba481d461351f42bb12ca44312f4d4fc17bc
---
 jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml | 3 ---
 jjb/cloud-infra/scripts/xtesting-healthcheck.sh        | 5 ++++-
 jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh  | 5 ++++-
 3 files changed, 8 insertions(+), 5 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 0e93bb4ae..a9555d6c3 100644
--- a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
@@ -433,8 +433,6 @@
       - fix-workspace-permissions
 
     builders:
-      - 'download-deploy-artifact-macro'
-      - 'xtesting-healthcheck-macro'
       - 'xtesting-infra-healthcheck-macro'
 
 - job-template:
@@ -474,6 +472,5 @@
 
     builders:
       - 'wait-pkg-mgr-macro'
-      - 'download-deploy-artifact-macro'
       - 'xtesting-healthcheck-macro'
 
diff --git a/jjb/cloud-infra/scripts/xtesting-healthcheck.sh b/jjb/cloud-infra/scripts/xtesting-healthcheck.sh
index 5b63fa26b..82eb18089 100755
--- a/jjb/cloud-infra/scripts/xtesting-healthcheck.sh
+++ b/jjb/cloud-infra/scripts/xtesting-healthcheck.sh
@@ -25,7 +25,10 @@ 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"
+  # 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"
 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 5b63fa26b..82eb18089 100755
--- a/jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh
+++ b/jjb/cloud-infra/scripts/xtesting-infra-healthcheck.sh
@@ -25,7 +25,10 @@ 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"
+  # 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"
 else
   TEST_ROOT_DIR="$WORKSPACE"
 fi
-- 
2.25.1