summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorselias <samelias@cisco.com>2017-04-25 14:49:33 +0200
committerSamuel Eliáš <samelias@cisco.com>2017-04-25 13:00:37 +0000
commit797e73fd9f964a3862e6c5079c3ecca3a8595989 (patch)
treec8338031c1e718d05d121a5077967ccf2ae30e70
parent6e8a002151a08784558502c7a576120a0d767590 (diff)
Allow specifying VPP repository in hc2vpp-integration job
Release version of hc2vpp needs to use vpp-api-java package from release repo, not stable/1704. Change-Id: I60a590d10957586d30f56c20f58663d58ed489f4 Signed-off-by: selias <samelias@cisco.com>
-rw-r--r--jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh16
1 files changed, 12 insertions, 4 deletions
diff --git a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
index 8c9aed4ef..08f6898e5 100644
--- a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
@@ -22,13 +22,21 @@ elif [ "${OS}" == "centos7" ]; then
CLASS=""
fi
-if [ "${STREAM}" == "master" ]; then
- STREAM_PART="master"
+# determine nexus repository to download VPP packages from
+if [ -e vpp-stream ]; then
+ # override file is present, use the specified repo
+ STREAM_PART=`./vpp-stream`
else
- STREAM_PART="stable.${STREAM}"
+ if [ "${STREAM}" == "master" ]; then
+ # use the newest master
+ STREAM_PART=".master"
+ else
+ # use stable version from branch
+ STREAM_PART=".stable.${STREAM}"
+ fi
fi
-REPO="fd.io.${STREAM_PART}.${OS_PART}"
+REPO="fd.io${STREAM_PART}.${OS_PART}"
for ART in ${ARTIFACTS}; do
for PAC in ${PACKAGE}; do