X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Finclude-raw-vpp-build.sh;h=6a13995e58294466ae7492883829e77e5aa3d734;hb=8601686e5afcb8ceec5fc5621f71e059fa864169;hp=97330ae09f11248ffa0e11b0a144e7c743a5def4;hpb=09963646f9b181f697dae472e6b04fb58125d758;p=ci-management.git

diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh
index 97330ae09..6a13995e5 100644
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -1,5 +1,12 @@
 #!/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
@@ -25,17 +32,25 @@ else
     echo "Cannot find cat /etc/bootstrap-functions.sha"
 fi
 
-echo "shasum of this script: ${0}"
-shasum $0
+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 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}" == "xTrue" ] || make UNATTENDED=yes verify
+else
+    echo "Building using \"make build-root/vagrant/build.sh\""
+    [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes install-dep
+    [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes dpdk-install-dev
+    [ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh
+fi
 
 if [ "x${VPP_REPO}" == "x1" ]; then
     if [ "x${REBASE_NEEDED}" == "x1" ]; then
@@ -46,16 +61,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
\ No newline at end of file
+echo "*******************************************************************"
+echo "* VPP BUILD SUCCESSFULLY COMPLETED"
+echo "*******************************************************************"