CSIT-682 Usage of make-verify for vpp-csit-verify jobs

[ci-management.git] / jjb / vpp / include-raw-vpp-csit-functional.sh

diff --git a/jjb/vpp/include-raw-vpp-csit-functional.sh b/jjb/vpp/include-raw-vpp-csit-functional.sh
index e0767c6..38ef7e0 100644 (file)
--- a/jjb/vpp/include-raw-vpp-csit-functional.sh
+++ b/jjb/vpp/include-raw-vpp-csit-functional.sh
@@ -1,10 +1,30 @@
 #!/bin/bash
 set -xeu -o pipefail
 
+# Get CSIT branch from which to test from
+# running build-root/scripts/csit-test-branch
+if [ -x build-root/scripts/csit-test-branch ]; then
+    CSIT_BRANCH=`build-root/scripts/csit-test-branch`;
+fi
+
 # Clone csit and start tests
-git clone https://gerrit.fd.io/r/csit
+git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH:-csit-verified}
+
+# 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:-csit-verified}"
+    echo "No such branch ${CSIT_BRANCH:-csit-verified} in https://gerrit.fd.io/r/csit"
+    exit
+fi
 
 cp build-root/*.deb csit/
+if [ -e dpdk/vpp-dpdk-dkms*.deb ]
+then
+    cp dpdk/vpp-dpdk-dkms*.deb csit/
+else
+    cp /var/cache/apt/archives/vpp-dpdk-dkms*.deb csit/
+fi
+
 cd csit
 # execute csit bootstrap script if it exists
 if [ -e bootstrap.sh ]