X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fhc2vpp%2Finclude-raw-hc2vpp-csit-verify-prebuild.sh;h=8e0c4ef91bf2c35006fa46c1aab34879d9b0509a;hb=536be0062a160b4595a73ba8d70593b9a0b7eb9e;hp=cfde5eacb76e0736d44005c58a7614409e12867e;hpb=e9345bdaa3e7f261b0cd7af8522d39bb9268bc87;p=ci-management.git

diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
index cfde5eacb..8e0c4ef91 100644
--- a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xeu -o pipefail
+set -xe -o pipefail
 
 # Parse optional arguments from gerrit comment trigger
 for i in ${GERRIT_EVENT_COMMENT_TEXT}; do
@@ -7,12 +7,18 @@ 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-`
         ;;
         *nsh_sfc=*)
             nsh_commit_id=`echo "${i}" | cut -d = -f2-`
         ;;
+        *csit=*)
+            csit_commit_id=`echo "${i}" | cut -d = -f2-`
+        ;;
         *)
         ;;
     esac
@@ -20,23 +26,25 @@ done
 
 # If HC variable is set, clone and build Honeycomb infra from the specified commit
 # Otherwise skip this step, hc2vpp will use Honeycomb snapshots from Nexus
-if [ -n "${hc_commit_id}" ]; then
+if [[ -n "${hc_commit_id}" ]]; then
     git clone https://gerrit.fd.io/r/honeycomb
     cd honeycomb
     ref=`git ls-remote -q | grep ${hc_commit_id} | awk '{print $2}'`
     git fetch origin ${ref} && git checkout FETCH_HEAD
-    mvn clean install -DskipTests -Dcheckstyle.skip -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-    if [ $? != 0 ]; then
+    mvn clean install -DskipTests -Dcheckstyle.skip -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}"
+    if [[ $? != 0 ]]; then
         echo "Honeycomb infra build failed."
         exit 1
     fi
     cd ${WORKSPACE}
+    # Clean up when done. Leftover build files interfere with building hc2vpp.
+    rm -rf honeycomb
 fi
 
 # TODO: Add option to build custom VPP and NSH packages
 
 # Get CSIT branch from which to test from
-if [ -f csit-test-branch ]; then
+if [[ -f csit-test-branch ]]; then
     chmod +x csit-test-branch
     CSIT_BRANCH=`./csit-test-branch`
 else
@@ -47,18 +55,35 @@ fi
 git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH}
 
 # If the git clone fails, complain clearly and exit
-if [ $? != 0 ]; then
+if [[ $? != 0 ]]; then
     echo "Failed to run: git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH}"
     exit 1
 fi
 
 cd csit
 
+# If CSIT commit ID is given, checkout the specified commit
+if [[ -n "${csit_commit_id}" ]]; then
+    # Example:
+    # ...
+    # e8f326efebb58e28dacb9ebb653baf95aad1448c refs/changes/08/11808/1
+    # ...
+    ref=`git ls-remote -q | grep ${csit_commit_id} | awk '{print $2}'`
+    git fetch origin ${ref} && git checkout FETCH_HEAD
+fi
+
 # Download VPP packages
-if [ ${STREAM} == 'master' ]; then
-    ./resources/tools/scripts/download_hc_build_pkgs.sh ${STREAM} ${OS}
-else
+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}