diff options
| -rwxr-xr-x | resources/tools/scripts/download_hc_pkgs.sh | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/resources/tools/scripts/download_hc_pkgs.sh b/resources/tools/scripts/download_hc_pkgs.sh index 1bda02505c..a7562aa7f4 100755 --- a/resources/tools/scripts/download_hc_pkgs.sh +++ b/resources/tools/scripts/download_hc_pkgs.sh @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -ex +set -x STREAM=$1 OS=$2 @@ -68,12 +68,18 @@ for ART in ${NSH_ARTIFACTS}; do done # determine VPP dependency +# use latest if honeycomb package does not depend on single VPP version, e.g. stable branches since HC2VPP-285 +VER="RELEASE" if [ "${OS}" == "centos7" ]; then - VER=`rpm -qpR honeycomb*.rpm | grep 'vpp ' | cut -d ' ' -f 3` - VER=${VER}.x86_64 + HC_VPP_VER=`rpm -qpR honeycomb*.rpm | grep -oP 'vpp = \K.+'` + if [ "${HC_VPP_VER}" != "" ]; then + VER=${HC_VPP_VER}.x86_64 + fi else - VER=`dpkg -I honeycomb*.deb | grep -oP 'vpp \(= \K[^\)]+'` - VER=${VER}_amd64 + HC_VPP_VER=`dpkg -I honeycomb*.deb | grep -oP 'vpp \(= \K[^\)]+'` + if [ "${HC_VPP_VER}" != "" ]; then + VER=${HC_VPP_VER}_amd64 + fi fi # download VPP packages |