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

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

diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh
index ba55111..5e603d2 100644 (file)
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -30,20 +30,28 @@ sha1sum $0
 
 echo "CC=${CC}"
 echo "IS_CSIT_VPP_JOB=${IS_CSIT_VPP_JOB}"
-
 # If and only if we are doing verify *after* make verify was made to work
 # and we are not a CSIT job just building packages, then use make verify,
-# else use the old build-root/vagrant/build.sh
+# else use the old extras/vagrant/build.sh
 if (git log --oneline | grep 37682e1 > /dev/null 2>&1) && \
         [ "x${IS_CSIT_VPP_JOB}" != "xTrue" ]
 then
     echo "Building using \"make verify\""
-    [ "x${DRYRUN}" != "True" ]|| make UNATTENDED=yes verify
+    [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify
 else
-    echo "Building using \"build-root/vagrant/build.sh\""
-    [ "x${DRYRUN}" != "True" ] || build-root/vagrant/build.sh
+    echo "Building using \"make extras/vagrant/build.sh\""
+    [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes dpdk-install-dev
+    [ "x${DRYRUN}" == "xTrue" ] || extras/vagrant/build.sh
 fi
 
+if [ "x${VPP_REPO}" == "x1" ]; then
+    if [ "x${REBASE_NEEDED}" == "x1" ]; then
+        echo "This patch to vpp is based on an old point in the tree that is likely"
+        echo "to fail verify."
+        echo "PLEASE REBASE PATCH ON THE CURRENT HEAD OF THE VPP REPO"
+        exit 1
+    fi
+fi
 
 echo "*******************************************************************"
 echo "* VPP BUILD SUCCESSFULLY COMPLETED"