From 59bfc801ac8e95679e6791bccb4b60777128d6ae Mon Sep 17 00:00:00 2001
From: Prasad Mukhedkar <prasad.mukhedkar@est.tech>
Date: Tue, 9 Mar 2021 12:44:31 +0100
Subject: [PATCH] Remove refspec and add required builders

This commit removes refspec reference in test-package.sh script that points
 to infra/engine repo and adds builders to download artifacts.

Signed-off-by: Prasad Mukhedkar <prasad.mukhedkar@est.tech>
Change-Id: I213bb6de525fe7c7de2dfa6e9c2e653e9a12ea0d
---
 .../onap-jobs/onap-release-deploy-test.yaml           |  6 ++++++
 jjb/cloud-infra/scripts/test-package.sh               | 11 +----------
 2 files changed, 7 insertions(+), 10 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 ffc0d9e4..6a419190 100644
--- a/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
@@ -354,6 +354,9 @@
       - fix-workspace-permissions
 
     builders:
+      - 'generate-ssh-keypair-macro'
+      - 'wait-pkg-mgr-macro'
+      - 'download-deploy-artifact-macro'
       - 'xtesting-infra-healthcheck-macro'
 
 - job-template:
@@ -392,4 +395,7 @@
       - fix-workspace-permissions
 
     builders:
+      - 'generate-ssh-keypair-macro'
+      - 'wait-pkg-mgr-macro'
+      - 'download-deploy-artifact-macro'
       - 'xtesting-healthcheck-macro'
diff --git a/jjb/cloud-infra/scripts/test-package.sh b/jjb/cloud-infra/scripts/test-package.sh
index ef20ad08..6361664b 100644
--- a/jjb/cloud-infra/scripts/test-package.sh
+++ b/jjb/cloud-infra/scripts/test-package.sh
@@ -30,18 +30,9 @@ if [[ "$GERRIT_PROJECT" != "infra/test" ]]; then
   cd "$WORKSPACE"
 fi
 
-# NOTE (fdegir): this variable is set by generate-change-metadata.sh script
-# if a dependency to engine repo is determined so we check out that refspec
-# to ensure we respect the dependency
-if [[ ! -z "${NORDIX_ENGINE_REFSPEC+x}" ]]; then
-  echo "Info  : Fetching dependent change ${NORDIX_ENGINE_REFSPEC} infra/engine"
-  git fetch "https://gerrit.nordix.org/infra/test" ${NORDIX_ENGINE_REFSPEC} && git checkout FETCH_HEAD
-fi
-
-echo "Info  : Packaging stack $STACK_TYPE"
+echo "Info  : Packaging test stack $STACK_TYPE"
 
 cd "$WORKSPACE/test"
 ./package.sh -s "$STACK_TYPE" -b "$STACK_VERSION" -d "$DISTRO" -v
 
 # vim: set ts=2 sw=2 expandtab:
-
-- 
2.25.1