From: afenner <andrew.fenner@est.tech>
Date: Wed, 5 Aug 2020 07:42:56 +0000 (+0100)
Subject: Fix path for k8s download for ONAP install
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=c2e7ec34041521c499d31e1091e36f62e5379f1e;p=infra%2Fcicd.git

Fix path for k8s download for ONAP install

Alter Path to include version

Change-Id: I914b14a87f76d50e07aaccba97a7aa8baa83c76e
Signed-off-by: afenner <andrew.fenner@est.tech>
---

diff --git a/jjb/cloud-infra/scripts/generate-k8sdeployment-environment.sh b/jjb/cloud-infra/scripts/generate-k8sdeployment-environment.sh
index 0098c9d20..d45ff85cb 100644
--- a/jjb/cloud-infra/scripts/generate-k8sdeployment-environment.sh
+++ b/jjb/cloud-infra/scripts/generate-k8sdeployment-environment.sh
@@ -47,10 +47,12 @@ echo "NORDIX_STACK_VERSION=$K8S_VERSION" >> "$K8S_DEPLOYMENT_FILE"
 # global vars
 export NORDIX_ARM_HTTPS_URL="https://artifactory.nordix.org/artifactory"
 export ARTIFACT_ARM_FOLDER="release"
-export BUILD_IDENTIFIER="latest"
+export BUILD_IDENTIFIER="${K8S_VERSION}/stack/latest"
 export OFFLINE_INSTALLER_FILE="/tmp/${STACK_TYPE}-${K8S_VERSION}-${DISTRO}.bsx"
 export BUILD_ARTIFACTS="/tmp/${STACK_TYPE}-${K8S_VERSION}-${DISTRO}.bsx"
 export NORDIX_ARM_REPO="nordix-${STACK_TYPE}"
+# looking to make url looking like
+# https://artifactory.nordix.org/artifactory/nordix-kubernetes/oss/release/1.15/stack/latest/kubernetes-1.15-ubuntu1804.bsx
 export NORDIX_ARTIFACT_URL="$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/oss/$ARTIFACT_ARM_FOLDER/$BUILD_IDENTIFIER"
 
 cat << EOF >> "$K8S_DEPLOYMENT_FILE"