Align CSIT jobs VPP compilation with VPP jobs compilation

[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 2b56eb4..1fe995f 100644 (file)
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -1,6 +1,13 @@
 #!/bin/bash
 # basic build script example
 set -xe -o pipefail
+
+OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+
+echo OS_ID: $OS_ID
+echo OS_VERSION_ID: $OS_VERSION_ID
+
 # do nothing but print the current slave hostname
 hostname
 export CCACHE_DIR=/tmp/ccache
@@ -28,19 +35,20 @@ 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
-
-# Due to a shift to make verify, after 2016-12-01 we need to make sure any patches
-# coming in happen after 37682e1
-(git log --oneline | grep 37682e1 > /dev/null 2>&1);if [ $? != 0 ]; then REBASE_NEEDED="1";fi
-
-echo "REBASE_NEEDED: ${REBASE_NEEDED}"
-echo "VPP_REPO: ${VPP_REPO}"
+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 make pkg-verify.
+if (git log --oneline | grep 37682e1 > /dev/null 2>&1) && \
+        [ "x${IS_CSIT_VPP_JOB}" != "xTrue" ]
+then
+    echo "Building using \"make verify\""
+    [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify
+else
+    echo "Building using \"make pkg-verify\""
+    [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes pkg-verify
+fi
 
 if [ "x${VPP_REPO}" == "x1" ]; then
     if [ "x${REBASE_NEEDED}" == "x1" ]; then
@@ -50,8 +58,6 @@ if [ "x${VPP_REPO}" == "x1" ]; then
         exit 1
     fi
 fi
-echo "CC=${CC}"
-make UNATTENDED=yes verify
 
 echo "*******************************************************************"
 echo "* VPP BUILD SUCCESSFULLY COMPLETED"