Merge "Add IPA image building jjb"

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 a9555d6c3544253e1e31eee2aa4eb714ec91ae9d..6caf4e9b6835caf99945bfbcf09f336adaeb4f6d 100644 (file)
--- 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 82eb18089ff57625aaea3774826d20b0fa2d4507..5b63fa26b68d1596595af990f6d16aa373e3a96e 100755 (executable)
--- 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 82eb18089ff57625aaea3774826d20b0fa2d4507..5b63fa26b68d1596595af990f6d16aa373e3a96e 100755 (executable)
--- 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