Use make verify only after its working and not for CSIT builds.

This patch does the following:

1)  Introduces a new PARAMATER called is-csit-vpp-job
2)  Sets that PARAMETER to 'True' for csit-vpp-jobs
3)  Changes the include-raw-vpp-build.sh so that:
    a)  It uses make verify only if this is not a csit job *and*
        if the patch has as a parent a point from which make verify
        is known to work
    b)  It uses the old build.sh if its building CSIT jobs or the patch
        is from before make verify.

The result is, patches should verify or not on their own merit, not
on the happenstance of coming before or after make verify, and
we don't do the extra make verify work for jobs were CSIT just needs
packages built.

Change-Id: I1066c6a8087e639d81e9afab809f4a02b1f6b99c
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh
index b606fc6..ba55111 100644 (file)
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -28,26 +28,22 @@ fi
 echo "sha1sum of this script: ${0}"
 sha1sum $0
 
-# Check to make sure the patch doesn't need to be rebased
-# Since there was a discontinuity, patches with a
-# parent before 30d41ff need to be rebased
-
-(git log --oneline | grep 30d41ff > /dev/null 2>&1);if [ $? != 0 ]; then REBASE_NEEDED="1";fi
-(git log --oneline | grep fb0815d > /dev/null 2>&1);if [ $? == 0 ]; then VPP_REPO="1";fi
-echo "REBASE_NEEDED: ${REBASE_NEEDED}"
-echo "VPP_REPO: ${VPP_REPO}"
-
-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 "CC=${CC}"
 echo "IS_CSIT_VPP_JOB=${IS_CSIT_VPP_JOB}"
-make UNATTENDED=yes verify
+
+# 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
+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
+else
+    echo "Building using \"build-root/vagrant/build.sh\""
+    [ "x${DRYRUN}" != "True" ] || build-root/vagrant/build.sh
+fi
+
 
 echo "*******************************************************************"
 echo "* VPP BUILD SUCCESSFULLY COMPLETED"