X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fartifacts.sh;h=0a08d7311ea2dbabda1c845c6ed1b5701e6e8773;hb=493684d9a6d22dc86f8260fe8cc4244ba71b5e9e;hp=35fade98af0c8973ebb5542c1f93524368b162f6;hpb=0e853acbf246dde97bf8b376cffca1aefdf1aa7b;p=csit.git diff --git a/resources/libraries/bash/function/artifacts.sh b/resources/libraries/bash/function/artifacts.sh index 35fade98af..0a08d7311e 100644 --- a/resources/libraries/bash/function/artifacts.sh +++ b/resources/libraries/bash/function/artifacts.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2020 Cisco and/or its affiliates. # Copyright (c) 2019 PANTHEON.tech and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -88,7 +88,7 @@ function download_ubuntu_artifacts () { packages=$(apt-cache -o Dir::Etc::SourceList=${apt_fdio_repo_file} \ -o Dir::Etc::SourceParts=${apt_fdio_repo_file} dumpavail \ - | grep Package: | cut -d " " -f 2) || { + | grep Package: | cut -d " " -f 2 | grep vpp) || { die "Retrieval of available VPP packages failed." } if [ -z "${VPP_VERSION-}" ]; then @@ -104,7 +104,7 @@ function download_ubuntu_artifacts () { set +x for package in ${packages}; do # Filter packages with given version - pkg_info=$(apt-cache show ${package}) || { + pkg_info=$(apt-cache show -- ${package}) || { die "apt-cache show on ${package} failed." } ver=$(echo ${pkg_info} | grep -o "Version: ${VPP_VERSION-}[^ ]*" | \