diff options
| author |   selias <samelias@cisco.com> | 2017-02-06 10:42:00 +0100 |
|---|---|---|
| committer |   Peter Mikus <pmikus@cisco.com> | 2017-02-14 09:28:00 +0000 |
| commit | 4df00930b5a2cf67f32682f44e0540819b9575af (patch) | |
| tree | ddecc51120214203d6381208f81bd2f52ad47ae7 /resources | |
| parent | 44dc1d4781470b722c5f7d5adb197ace96b96db3 (diff) | |
HC Test: Add branch and os parameters to honeycomb scripts
- partial cherrypick of https://gerrit.fd.io/r/4933
- add OS argument to scripts in preparation for Ubuntu16 and Centos7
Change-Id: I14119703be0f73766a731478e09e0126078f84ba
Signed-off-by: selias <samelias@cisco.com>
Diffstat (limited to 'resources')
| -rwxr-xr-x | resources/tools/download_hc_build_pkgs.sh | 20 | ||||
| -rwxr-xr-x | resources/tools/download_hc_pkgs.sh | 20 |
2 files changed, 34 insertions, 6 deletions
diff --git a/resources/tools/download_hc_build_pkgs.sh b/resources/tools/download_hc_build_pkgs.sh index 71a2efea24..3847c4ab1c 100755 --- a/resources/tools/download_hc_build_pkgs.sh +++ b/resources/tools/download_hc_build_pkgs.sh @@ -17,17 +17,31 @@ set -ex trap 'rm -f *.deb.md5; exit' EXIT trap 'rm -f *.deb.md5;rm -f *.deb; exit' ERR +STREAM=$1 +OS=$2 # Download the latest VPP and VPP plugin .deb packages URL="https://nexus.fd.io/service/local/artifact/maven/content" VER="LATEST" -REPO='fd.io.master.ubuntu.trusty.main' +REPO="fd.io.${STREAM}.ubuntu.trusty.main" VPP_GROUP="io.fd.vpp" NSH_GROUP="io.fd.nsh_sfc" VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dev vpp-dpdk-dkms vpp-lib vpp-plugins vpp-api-java" NSH_ARTIFACTS="vpp-nsh-plugin" -PACKAGE="deb deb.md5" -CLASS="deb" + +if [ "${OS}" == "ubuntu1404" ]; then + OS="ubuntu.trusty.main" + PACKAGE="deb deb.md5" + CLASS="deb" +elif [ "${OS}" == "ubuntu1604" ]; then + OS="ubuntu.xenial.main" + PACKAGE="deb deb.md5" + CLASS="deb" +elif [ "${OS}" == "centos7" ]; then + OS="centos7" + PACKAGE="rpm rpm.md5" + CLASS="rpm" +fi for ART in ${VPP_ARTIFACTS}; do for PAC in $PACKAGE; do diff --git a/resources/tools/download_hc_pkgs.sh b/resources/tools/download_hc_pkgs.sh index d52e2469e0..b958dc97d9 100755 --- a/resources/tools/download_hc_pkgs.sh +++ b/resources/tools/download_hc_pkgs.sh @@ -17,18 +17,32 @@ set -ex trap 'rm -f *.deb.md5; exit' EXIT trap 'rm -f *.deb.md5;rm -f *.deb; exit' ERR +STREAM=$1 +OS=$2 URL="https://nexus.fd.io/service/local/artifact/maven/content" VER="RELEASE" -REPO='fd.io.master.ubuntu.trusty.main' +REPO="fd.io.${STREAM}.${OS}" GROUP="io.fd.vpp" HC_GROUP="io.fd.hc2vpp" NSH_GROUP="io.fd.nsh_sfc" VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dev vpp-dpdk-dkms vpp-lib vpp-plugins vpp-api-java" HC_ARTIFACTS="honeycomb" NSH_ARTIFACTS="vpp-nsh-plugin" -PACKAGE="deb deb.md5" -CLASS="deb" + +if [ "${OS}" == "ubuntu1404" ]; then + OS="ubuntu.trusty.main" + PACKAGE="deb deb.md5" + CLASS="deb" +elif [ "${OS}" == "ubuntu1604" ]; then + OS="ubuntu.xenial.main" + PACKAGE="deb deb.md5" + CLASS="deb" +elif [ "${OS}" == "centos7" ]; then + OS="centos7" + PACKAGE="rpm rpm.md5" + CLASS="rpm" +fi for ART in ${VPP_ARTIFACTS}; do for PAC in $PACKAGE; do |