summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Cmarada <mcmarada@cisco.com>2019-05-06 14:33:11 +0200
committerMichal Cmarada <mcmarada@cisco.com>2019-05-06 12:50:17 +0000
commit23fc53b512e05441e80d63dc4c326b45af5920be (patch)
tree7adc03f7e11d8ef07e8e4ebf78ac6e87f284ee41
parentd4d9fd5736216252f043a040a6cb265a8001a74d (diff)
fix hc2vpp release branch builds
When release version of HC2VPP is being build, we need to download release version of JVPP package to install correct JVPP artifacts. Change-Id: I922aaccb829fc4afc8bbd797aedd62f368d34c34 Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
-rw-r--r--jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
index 1e54750b2..dc4ca43de 100644
--- a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
@@ -21,6 +21,14 @@ echo DISTRIB_RELEASE: ${DISTRIB_RELEASE}
echo DISTRIB_CODENAME: ${DISTRIB_CODENAME}
echo DISTRIB_DESCRIPTION: ${DISTRIB_DESCRIPTION}
+if [[ "$VERSION" == *"-release" ]]; then
+ # at the time when HC2VPP release packages are being build,
+ # jvpp release packages are already promoted to release repository.
+ # Therefore we need to switch to release repository in order to download
+ # correct jvpp package versions
+ STREAM="release"
+fi
+
echo "----- DOWNLOADING PACKAGES -----"
if ! [[ -z ${REPO_NAME} ]]; then
REPO_URL="https://packagecloud.io/fdio/${STREAM}"
@@ -30,6 +38,10 @@ if ! [[ -z ${REPO_NAME} ]]; then
echo "Deleting: /etc/apt/sources.list.d/99fd.io.list"
sudo rm /etc/apt/sources.list.d/99fd.io.list
fi
+ if ! [[ "${STREAM}" == "master" ]]; then
+ echo "stable branch - clearing all fdio repos. new one will be installed."
+ sudo rm -f /etc/apt/sources.list.d/fdio_*.list
+ fi
curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.deb.sh | sudo bash
if [[ "${VERSION}" != 'RELEASE' ]]; then
# download specific version if set