X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Finclude-raw-vpp-build.sh;h=4ddcc84e05b866ef0585dbc9e706a51dd7a3d3ee;hb=777ab9620d975b68d6c29112b3c2537649e99029;hp=55fadd0d593ded67aa0e33d1a467708619378742;hpb=41d220f1ce14bef23a14e5b6ab0924f3dcafcdb7;p=ci-management.git

diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh
index 55fadd0d5..4ddcc84e0 100644
--- 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,14 +35,32 @@ 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 build-root/vagrant/build.sh
+if (git log --oneline | grep 37682e1 > /dev/null 2>&1) && \
+        [ "x${IS_CSIT_VPP_JOB}" != "xTrue" ]
+then
+    if [ "$OS_ID" == "opensuse" ]; then
+        echo "Building for openSUSE"
+        [ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh
+    else
+        echo "Building using \"make verify\""
+        [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify
+    fi
+else
+    if [ "$OS_ID" == "opensuse" ]; then
+        echo "Building for openSUSE"
+        [ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh
+    else
+        echo "Building using \"make build-root/vagrant/build.sh\""
+        [ "x${DRYRUN}" == "xTrue" ] || make install-dep
+        [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes dpdk-install-dev
+        [ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh
+    fi
+fi
 
 if [ "x${VPP_REPO}" == "x1" ]; then
     if [ "x${REBASE_NEEDED}" == "x1" ]; then
@@ -45,8 +70,6 @@ if [ "x${VPP_REPO}" == "x1" ]; then
         exit 1
     fi
 fi
-echo "CC=${CC}"
-make UNATTENDED=yes verify
 
 echo "*******************************************************************"
 echo "* VPP BUILD SUCCESSFULLY COMPLETED"