Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-1417: Prepare data sets for Report 1901
[csit.git]
/
resources
/
tools
/
scripts
/
download_hc_build_pkgs.sh
diff --git
a/resources/tools/scripts/download_hc_build_pkgs.sh
b/resources/tools/scripts/download_hc_build_pkgs.sh
index
474344a
..
48ef1eb
100755
(executable)
--- a/
resources/tools/scripts/download_hc_build_pkgs.sh
+++ b/
resources/tools/scripts/download_hc_build_pkgs.sh
@@
-18,33
+18,35
@@
set -ex
STREAM=$1
OS=$2
STREAM=$1
OS=$2
-# Download the latest VPP and VPP plugin .deb packages
URL="https://nexus.fd.io/service/local/artifact/maven/content"
URL="https://nexus.fd.io/service/local/artifact/maven/content"
-VER="RELEASE"
VPP_GROUP="io.fd.vpp"
# TODO(CSIT-994): reenable NSH
# NSH_GROUP="io.fd.nsh_sfc"
# NSH_ARTIFACTS="vpp-nsh-plugin"
VPP_GROUP="io.fd.vpp"
# TODO(CSIT-994): reenable NSH
# NSH_GROUP="io.fd.nsh_sfc"
# NSH_ARTIFACTS="vpp-nsh-plugin"
+VPP_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-java"
-if [ "${OS}" == "ubuntu1404" ]; then
- OS="ubuntu.trusty.main"
- PACKAGE="deb deb.md5"
- CLASS="deb"
- VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dkms vpp-lib vpp-plugins vpp-api-java"
-elif [ "${OS}" == "ubuntu1604" ]; then
+if [ "${OS}" == "ubuntu1604" ]; then
OS="ubuntu.xenial.main"
PACKAGE="deb deb.md5"
CLASS="deb"
OS="ubuntu.xenial.main"
PACKAGE="deb deb.md5"
CLASS="deb"
- VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dkms vpp-lib vpp-plugins vpp-api-java"
elif [ "${OS}" == "centos7" ]; then
OS="centos7"
PACKAGE="rpm rpm.md5"
CLASS=""
elif [ "${OS}" == "centos7" ]; then
OS="centos7"
PACKAGE="rpm rpm.md5"
CLASS=""
- VPP_ARTIFACTS="vpp vpp-debuginfo vpp-devel vpp-lib vpp-plugins vpp-api-java"
fi
REPO="fd.io.${STREAM}.${OS}"
fi
REPO="fd.io.${STREAM}.${OS}"
+# Use vpp packages based on vpp-version file from hc2vpp project
+VER=`../vpp-version`
+if [ "${VER}" != 'RELEASE' ]; then
+ if [ "${OS}" == "centos7" ]; then
+ VER="${VER}.x86_64"
+ else
+ VER="${VER}_amd64"
+ fi
+fi
+
for ART in ${VPP_ARTIFACTS}; do
for PAC in ${PACKAGE}; do
curl "${URL}?r=${REPO}&g=${VPP_GROUP}&a=${ART}&p=${PAC}&v=${VER}&c=${CLASS}" -O -J || exit
for ART in ${VPP_ARTIFACTS}; do
for PAC in ${PACKAGE}; do
curl "${URL}?r=${REPO}&g=${VPP_GROUP}&a=${ART}&p=${PAC}&v=${VER}&c=${CLASS}" -O -J || exit