Merge "Add INFO.yaml verify job"

[ci-management.git] / jjb / hc2vpp / include-raw-hc2vpp-csit-verify-prebuild.sh

diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
index 9e95f4a..8e0c4ef 100644 (file)
--- 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-`
         ;;
@@ -70,7 +73,17 @@ if [[ -n "${csit_commit_id}" ]]; then
 fi
 
 # Download VPP packages
-./resources/tools/scripts/download_hc_build_pkgs.sh ${STREAM} ${OS}l
-
+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} ${jvpp_commit_id}
+fi
 
 cd ${WORKSPACE}