diff options
| author |   selias <samelias@cisco.com> | 2017-04-26 14:20:48 +0200 |
|---|---|---|
| committer | selias <samelias@cisco.com> | 2017-04-26 14:25:52 +0200 |
| commit | 554c932e8f38aa5f2466b3ebb29e9601b579d82f (patch) | |
| tree | 42fcf5b631983c8e2604baaf391c9ad374f547fb | |
| parent | 7d2ebe855f165cbea4692552c1996b0f32322e02 (diff) | |
Allow specifying VPP package version in hc2vpp-integration job
Additionally revert commit https://gerrit.fd.io/r/6416
Change-Id: I35a4de91e275f7653a382f9908b3d672658c1bf1
Signed-off-by: selias <samelias@cisco.com>
| -rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh index 08f6898e5..c99d6657d 100644 --- a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh +++ b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh @@ -8,6 +8,15 @@ VERSION="RELEASE" GROUP="io.fd.vpp" ARTIFACTS="vpp-api-java" +VERSION=`./vpp-version` +if [ "${VERSION}" != 'RELEASE' ]; then + if [ "${OS}" == "centos7" ]; then + VERSION="${VERSION}.x86_64" + else + VERSION="${VERSION}_amd64" + fi +fi + if [ "${OS}" == "ubuntu1404" ]; then OS_PART="ubuntu.trusty.main" PACKAGE="deb deb.md5" @@ -22,21 +31,13 @@ elif [ "${OS}" == "centos7" ]; then CLASS="" fi -# 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` +if [ "${STREAM}" == "master" ]; then + STREAM_PART="master" else - if [ "${STREAM}" == "master" ]; then - # use the newest master - STREAM_PART=".master" - else - # use stable version from branch - STREAM_PART=".stable.${STREAM}" - fi + STREAM_PART="stable.${STREAM}" 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 |