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 4ddcc84..1fe995f 100644 (file)
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -39,27 +39,15 @@ 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
+# else use make pkg-verify.
 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
+    echo "Building using \"make verify\""
+    [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify
 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
+    echo "Building using \"make pkg-verify\""
+    [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes pkg-verify
 fi
 
 if [ "x${VPP_REPO}" == "x1" ]; then