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 bacac43..5e603d2 100644 (file)
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # basic build script example
-
+set -xe -o pipefail
 # do nothing but print the current slave hostname
 hostname
 export CCACHE_DIR=/tmp/ccache
@@ -28,14 +28,21 @@ 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}"
+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 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}" == "xTrue" ] || make UNATTENDED=yes verify
+else
+    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
@@ -46,16 +53,6 @@ if [ "x${VPP_REPO}" == "x1" ]; then
     fi
 fi
 
-# Make sure we are starting on java-7.  This catches bugs in the
-# vpp build system that can occur on Ubuntu 14.04 when a user may
-# have both java-7 and java-8 installed.
-if [ ${OS} == ubuntu1404 ];then
-    sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64
-fi
-
-build-root/vagrant/build.sh
-if [ $? == 0 ];then
-    echo "*******************************************************************"
-    echo "* VPP BUILD SUCCESSFULLY COMPLETED"
-    echo "*******************************************************************"
-fi
+echo "*******************************************************************"
+echo "* VPP BUILD SUCCESSFULLY COMPLETED"
+echo "*******************************************************************"