X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fhc2vpp%2Finclude-raw-hc2vpp-csit-verify-prebuild.sh;h=cfde5eacb76e0736d44005c58a7614409e12867e;hb=9232f92ae6c6d70d403c84a71ea1ab730358161e;hp=f3c3bb0c84670e102a516c1642e2bbd43b5b5612;hpb=db300c0dcceb1fe54dbd424c7f622a4d1e509ff6;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 f3c3bb0c8..cfde5eacb 100644
--- a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
@@ -1,31 +1,64 @@
 #!/bin/bash
 set -xeu -o pipefail
 
-current_dir=`pwd`
-cd ${WORKSPACE}
+# Parse optional arguments from gerrit comment trigger
+for i in ${GERRIT_EVENT_COMMENT_TEXT}; do
+    case ${i} in
+        *honeycomb=*)
+            hc_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-`
+        ;;
+        *)
+        ;;
+    esac
+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
+    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
+        echo "Honeycomb infra build failed."
+        exit 1
+    fi
+    cd ${WORKSPACE}
+fi
+
+# TODO: Add option to build custom VPP and NSH packages
 
 # Get CSIT branch from which to test from
-# running build-root/scripts/csit-test-branch
 if [ -f csit-test-branch ]; then
     chmod +x csit-test-branch
     CSIT_BRANCH=`./csit-test-branch`
+else
+    CSIT_BRANCH='master'
 fi
 
-# Clone csit and download VPP packages
+# Clone csit
 git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH}
 
 # If the git clone fails, complain clearly and exit
 if [ $? != 0 ]; then
     echo "Failed to run: git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH}"
-    exit
+    exit 1
 fi
 
 cd csit
 
+# Download VPP packages
 if [ ${STREAM} == 'master' ]; then
-    ./csit/resources/tools/download_hc_build_pkgs.sh ${STREAM}
+    ./resources/tools/scripts/download_hc_build_pkgs.sh ${STREAM} ${OS}
 else
-    ./csit/resources/tools/download_hc_build_pkgs.sh 'stable.'${STREAM}
+    ./resources/tools/scripts/download_hc_build_pkgs.sh 'stable.'${STREAM} ${OS}
 fi
 
-cd ${current_dir}
+cd ${WORKSPACE}