From: Michal Cmarada Date: Wed, 6 Mar 2019 10:22:51 +0000 (+0100) Subject: add jvpp commit id parameter support X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=b2d46f8e46d7d74c796c2d1afe6181d58fd8406a;p=ci-management.git add jvpp commit id parameter support Change-Id: Id46b5c0fff6486e2a7f2778395f360d7b0c7f7ea Signed-off-by: Michal Cmarada --- diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh index d63942ad1..8e0c4ef91 100644 --- a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh +++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh @@ -7,6 +7,9 @@ for i in ${GERRIT_EVENT_COMMENT_TEXT}; do *honeycomb=*) hc_commit_id=`echo "${i}" | cut -d = -f2-` ;; + *jvpp=*) + jvpp_commit_id=`echo "${i}" | cut -d = -f2-` + ;; *vpp=*) vpp_commit_id=`echo "${i}" | cut -d = -f2-` ;; @@ -73,10 +76,14 @@ fi if [[ "1807 1810 1901" =~ .*$STREAM.* ]]; then # add stable prefix for branches which have older version of package download script # This can be removed when support for 1901 branch ends. + if [[ -n "${jvpp_commit_id}" ]]; then + echo "Error: Specifying jvpp custom commit is not supported for 1807,1810,1901 stable branches" + exit 1 + fi ./resources/tools/scripts/download_hc_build_pkgs.sh 'stable.'${STREAM} ${OS} else # master and 1904+ branches use new package-cloud download script - ./resources/tools/scripts/download_hc_build_pkgs.sh ${STREAM} ${OS} + ./resources/tools/scripts/download_hc_build_pkgs.sh ${STREAM} ${OS} ${jvpp_commit_id} fi cd ${WORKSPACE}