FIX: Correct the packagecloud.io URL path

Change-Id: I8aae4cb85f9bb1efaa19d75e2fd7c9593f20756d
Signed-off-by: Peter Mikus <pmikus@cisco.com>
(cherry picked from commit e44edcedef4dd2fee1c21b122b4bc6bb8586598e)

diff --git a/bootstrap-vpp-verify-nightly.sh b/bootstrap-vpp-verify-nightly.sh
index cc2b364..8f47ff0 100644 (file)
--- a/bootstrap-vpp-verify-nightly.sh
+++ b/bootstrap-vpp-verify-nightly.sh
@@ -55,6 +55,7 @@ else
     # Download the latest VPP build install packages
     rm -f *.${PACKAGE}
     echo Downloading VPP packages...
+    CSIT_DIR=${SCRIPT_DIR}
     source "${SCRIPT_DIR}/resources/libraries/bash/function/artifacts.sh"
     download_artifacts
     # Need to revert -euo as the rest of script is not optimized for this.

diff --git a/bootstrap-vpp-verify-semiweekly.sh b/bootstrap-vpp-verify-semiweekly.sh
index ecc7114..f8b6f34 100644 (file)
--- a/bootstrap-vpp-verify-semiweekly.sh
+++ b/bootstrap-vpp-verify-semiweekly.sh
@@ -65,6 +65,7 @@ if [ "${#}" -ne "0" ]; then
     echo ${arr[0]}
 else
     # Download the latest VPP build install packages
+    CSIT_DIR=${SCRIPT_DIR}
     source "${SCRIPT_DIR}/resources/libraries/bash/function/artifacts.sh"
     download_artifacts
     # Need to revert -euo as the rest of script is not optimized for this.

diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh
index d96e2d1..feced87 100644 (file)
--- a/bootstrap-vpp-verify-weekly.sh
+++ b/bootstrap-vpp-verify-weekly.sh
@@ -61,6 +61,7 @@ else
     # Download the specific VPP build install packages
     DKMS_VERSION=$(< ${SCRIPT_DIR}/DPDK_STABLE_VER)
     VPP_VERSION=$(< ${SCRIPT_DIR}/VPP_STABLE_VER_${DISTRO})
+    CSIT_DIR=${SCRIPT_DIR}
     source "${SCRIPT_DIR}/resources/libraries/bash/function/artifacts.sh"
     download_artifacts
     # Need to revert -euo as the rest of script is not optimized for this.

diff --git a/bootstrap.sh b/bootstrap.sh
index 015858b..d37f704 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -46,6 +46,7 @@ if [ "${#}" -ne "0" ]; then
 else
     DKMS_VERSION=$(< ${SCRIPT_DIR}/DPDK_STABLE_VER)
     VPP_VERSION=$(< ${SCRIPT_DIR}/VPP_STABLE_VER_${DISTRO})
+    CSIT_DIR=${SCRIPT_DIR}
     source "${SCRIPT_DIR}/resources/libraries/bash/function/artifacts.sh"
     download_artifacts
     # Need to revert -euo as the rest of script is not optimized for this.

diff --git a/resources/libraries/bash/function/artifacts.sh b/resources/libraries/bash/function/artifacts.sh
index 07a04c4..5ead298 100644 (file)
--- a/resources/libraries/bash/function/artifacts.sh
+++ b/resources/libraries/bash/function/artifacts.sh
@@ -18,6 +18,8 @@ set -exuo pipefail
 function download_artifacts () {
     # Get and/or install VPP artifacts from packagecloud.io.
     #
+    # Variables read:
+    # - CSIT_DIR - Path to existing root of local CSIT git repository.
     # Variables set:
     # - REPO_URL - FD.io Packagecloud repository.
 
@@ -27,7 +29,7 @@ function download_artifacts () {
         die "Get OS release failed."
     }
 
-    repo_url_path="./VPP_REPO_URL"
+    repo_url_path="${CSIT_DIR}/VPP_REPO_URL"
     if [ -e "${repo_url_path}" ]; then
         REPO_URL="$(<${repo_url_path})" || {
             die "Read repo URL from ${repo_url_path} failed."