Fix JVPP merge deps for release builds

At the time when JVPP release is done VPP packages are already
in the release repository. This fixes repository setup to use
release repository for dependencies in case of release build.

Change-Id: I12bbf02e9c27b54a8641253ab903abd96d8a5201
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>

diff --git a/jjb/scripts/setup_jvpp_dev_env.sh b/jjb/scripts/setup_jvpp_dev_env.sh
index f519dcb..9017f0d 100644 (file)
--- a/jjb/scripts/setup_jvpp_dev_env.sh
+++ b/jjb/scripts/setup_jvpp_dev_env.sh
@@ -16,6 +16,17 @@ echo DISTRIB_RELEASE: $DISTRIB_RELEASE
 echo DISTRIB_CODENAME: $DISTRIB_CODENAME
 echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION
 
+JVPP_VERSION=`./version`
+echo JVPP_VERSION: $JVPP_VERSION
+# Check release version
+if [[ "$JVPP_VERSION" == *"-release" ]]; then
+    # at the time when JVPP release packages are being build,
+    # vpp release packages are already promoted to release repository.
+    # Therefore we need to switch to release repository in order to download
+    # correct vpp package versions
+    STREAM="release"
+fi
+
 function setup {
     if ! [[ -z ${REPO_NAME} ]]; then
         echo "INSTALLING VPP-DPKG-DEV from apt/yum repo"