diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2018-02-22 07:46:09 +0100 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2018-02-22 11:10:29 +0100 |
| commit | ea23a533875c9f0a901a984585bc67b5d1457662 (patch) | |
| tree | a943aa5792784f68d90fca6826b9eae9a9656a1d | |
| parent | 1c66c33a1415ea6b09ee85159e2cf4ce1e8827a9 (diff) | |
Adapt hc2vpp-csit bootstrap scripts to HC2VPP-285/CIMANAGE-22
Since
https://gerrit.fd.io/r/#/c/10668/
and
https://gerrit.fd.io/r/#/c/10669/
honeycomb packages from stable branches
no longer depend on single VPP version.
This patch updates download_hc_pkgs.hc script,
used by hc2vpp-csit jobs, to use the latest honeycomb package
in such case.
Change-Id: If5b006e72caa8cc905137b1bf02af7d9e927e37a
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
| -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 |