From 7d59effce907d6d45d7c1809f57c2236e1c66774 Mon Sep 17 00:00:00 2001
From: Prasad Mukhedkar <prasad.mukhedkar@est.tech>
Date: Wed, 17 Mar 2021 06:47:13 +0100
Subject: [PATCH] Set BUILD_ARTIFACTS for xtesting framework

This commit sets xtesting upload and download artifacts varaible in
onap release job pipeline.


Change-Id: I32b45c2df8f1b75aa6e1fe6e30f441747583ceba
---
 jjb/cloud-infra/scripts/generate-change-metadata.sh           | 1 +
 jjb/cloud-infra/scripts/generate-k8sdeployment-environment.sh | 1 -
 jjb/cloud-infra/scripts/generate-release-metadata.sh          | 1 +
 jjb/cloud-infra/scripts/upload-xtesting-artifact.sh           | 2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jjb/cloud-infra/scripts/generate-change-metadata.sh b/jjb/cloud-infra/scripts/generate-change-metadata.sh
index 878735d2..4df6591e 100755
--- a/jjb/cloud-infra/scripts/generate-change-metadata.sh
+++ b/jjb/cloud-infra/scripts/generate-change-metadata.sh
@@ -171,6 +171,7 @@ export NORDIX_ARM_HTTPS_URL="https://artifactory.nordix.org/artifactory"
 export ARTIFACT_ARM_FOLDER="gerrit"
 export BUILD_IDENTIFIER=$GERRIT_CHANGE_NUMBER
 export OFFLINE_INSTALLER_FILE="/tmp/${STACK_TYPE}-${GERRIT_BRANCH}-${DISTRO}.bsx"
+export OFFLINE_XTESTING_FILE="/tmp/${STACK_TYPE}-test-${GERRIT_BRANCH}.bsx"
 export BUILD_ARTIFACTS="/tmp/${STACK_TYPE}-${GERRIT_BRANCH}-${DISTRO}.bsx"
 export NORDIX_ARM_REPO="nordix-${STACK_TYPE}"
 export NORDIX_ARTIFACT_URL="$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/oss/$ARTIFACT_ARM_FOLDER/$BUILD_IDENTIFIER"
diff --git a/jjb/cloud-infra/scripts/generate-k8sdeployment-environment.sh b/jjb/cloud-infra/scripts/generate-k8sdeployment-environment.sh
index 4535f4d0..ca285a46 100644
--- a/jjb/cloud-infra/scripts/generate-k8sdeployment-environment.sh
+++ b/jjb/cloud-infra/scripts/generate-k8sdeployment-environment.sh
@@ -45,7 +45,6 @@ export NORDIX_ARM_HTTPS_URL="https://artifactory.nordix.org/artifactory"
 export ARTIFACT_ARM_FOLDER="release"
 export BUILD_IDENTIFIER="${K8S_VERSION}/stack/latest"
 export OFFLINE_INSTALLER_FILE="/tmp/${STACK_TYPE}-${K8S_VERSION}-${DISTRO}.bsx"
-export OFFLINE_XTESTING_FILE="/tmp/${STACK_TYPE}-test-${GERRIT_BRANCH}.bsx"
 export BUILD_ARTIFACTS="/tmp/${STACK_TYPE}-${K8S_VERSION}-${DISTRO}.bsx"
 export NORDIX_ARM_REPO="nordix-${STACK_TYPE}"
 # looking to make url looking like
diff --git a/jjb/cloud-infra/scripts/generate-release-metadata.sh b/jjb/cloud-infra/scripts/generate-release-metadata.sh
index bd9100ff..ee689654 100755
--- a/jjb/cloud-infra/scripts/generate-release-metadata.sh
+++ b/jjb/cloud-infra/scripts/generate-release-metadata.sh
@@ -56,6 +56,7 @@ export NORDIX_ARM_HTTPS_URL="https://artifactory.nordix.org/artifactory"
 export ARTIFACT_ARM_FOLDER="release/${BRANCH}/stack"
 export BUILD_IDENTIFIER="$(date '+%Y%m%d%H%M')"
 export OFFLINE_INSTALLER_FILE="/tmp/${STACK_TYPE}-${BRANCH}-${DISTRO}.bsx"
+export OFFLINE_XTESTING_FILE="/tmp/${STACK_TYPE}-test-${GERRIT_BRANCH}.bsx"
 export BUILD_ARTIFACTS="/tmp/${STACK_TYPE}-${BRANCH}-${DISTRO}.bsx /tmp/offline-package.tgz $WORKSPACE/release.properties"
 export NORDIX_ARM_REPO="nordix-${STACK_TYPE}"
 export NORDIX_ARTIFACT_URL="$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/oss/$ARTIFACT_ARM_FOLDER/$BUILD_IDENTIFIER"
diff --git a/jjb/cloud-infra/scripts/upload-xtesting-artifact.sh b/jjb/cloud-infra/scripts/upload-xtesting-artifact.sh
index 991a9e71..10e3d43a 100755
--- a/jjb/cloud-infra/scripts/upload-xtesting-artifact.sh
+++ b/jjb/cloud-infra/scripts/upload-xtesting-artifact.sh
@@ -22,7 +22,7 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-export BUILD_ARTIFACTS="/tmp/${STACK_TYPE}-test-${GERRIT_BRANCH}.bsx"
+export BUILD_ARTIFACTS="/tmp/${STACK_TYPE}-test-${STACK_VERSION}.bsx"
 echo "Info  : Uploading $BUILD_ARTIFACTS to Nordix ARM $NORDIX_ARM_REPO repository"
 
 if [[ "$EXECUTION_MODE" == "packaging" || "$EXECUTION_MODE" == "offline-deployment" ]]; then
-- 
2.25.1