From e0869ae6b03fc078bbf83acaaa9a6b2a22b214f2 Mon Sep 17 00:00:00 2001
From: Ed Kern <ejk@cisco.com>
Date: Wed, 28 Aug 2019 11:48:41 -0600
Subject: [PATCH] VPP: make testauto the default for builds

Make testauto the default for all merge and verify
builds

Change-Id: If16bc763154c9197b9a10950a2eade3250ed7021
Signed-off-by: Ed Kern <ejk@cisco.com>
---
 jjb/vpp/include-raw-vpp-build.sh          |  2 +-
 jjb/vpp/include-raw-vpp-testauto-build.sh | 64 -------------------------------
 jjb/vpp/vpp.yaml                          |  2 +-
 3 files changed, 2 insertions(+), 66 deletions(-)
 delete mode 100644 jjb/vpp/include-raw-vpp-testauto-build.sh

diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh
index 1fe995fc2..6fdaec133 100644
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -44,7 +44,7 @@ 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
+    [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes TEST_JOBS=auto verify
 else
     echo "Building using \"make pkg-verify\""
     [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes pkg-verify
diff --git a/jjb/vpp/include-raw-vpp-testauto-build.sh b/jjb/vpp/include-raw-vpp-testauto-build.sh
deleted file mode 100644
index 6fdaec133..000000000
--- a/jjb/vpp/include-raw-vpp-testauto-build.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/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
-if [ -d $CCACHE_DIR ];then
-    echo $CCACHE_DIR exists
-    du -sk $CCACHE_DIR
-else
-    echo $CCACHE_DIR does not exist.  This must be a new slave.
-fi
-
-echo "cat /etc/bootstrap.sha"
-if [ -f /etc/bootstrap.sha ];then
-    cat /etc/bootstrap.sha
-else
-    echo "Cannot find cat /etc/bootstrap.sha"
-fi
-
-echo "cat /etc/bootstrap-functions.sha"
-if [ -f /etc/bootstrap-functions.sha ];then
-    cat /etc/bootstrap-functions.sha
-else
-    echo "Cannot find cat /etc/bootstrap-functions.sha"
-fi
-
-echo "sha1sum of this script: ${0}"
-sha1sum $0
-
-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 TEST_JOBS=auto 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
-        echo "This patch to vpp is based on an old point in the tree that is likely"
-        echo "to fail verify."
-        echo "PLEASE REBASE PATCH ON THE CURRENT HEAD OF THE VPP REPO"
-        exit 1
-    fi
-fi
-
-echo "*******************************************************************"
-echo "* VPP BUILD SUCCESSFULLY COMPLETED"
-echo "*******************************************************************"
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 9ec4940f3..8b15c6a6c 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -315,7 +315,7 @@
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_dpdk_dev_env.sh
-          - include-raw-vpp-testauto-build.sh
+          - include-raw-vpp-build.sh
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
-- 
2.16.6