From 1de137afb4c2cf14a2acb92b2c111b64b85e72ab Mon Sep 17 00:00:00 2001
From: Andrew Yourtchenko <ayourtch@gmail.com>
Date: Mon, 29 Jun 2020 16:38:32 +0000
Subject: Recycle vpp-verify-{stream}-clang into vpp-verify-{stream}-debug job

The non-voting clang job has been there for a while, not very useful
since clang is now the default compiler. This converts
the clang job into a "make test-debug" job, run eventually with ASAN.

Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
Change-Id: I011d7d1e2d887f5dec32e27d05859dcd64a3e548
---
 jjb/scripts/vpp/clang-build.sh | 40 ----------------------------------
 jjb/scripts/vpp/debug-build.sh | 49 ++++++++++++++++++++++++++++++++++++++++++
 jjb/vpp/vpp.yaml               |  7 +++---
 3 files changed, 53 insertions(+), 43 deletions(-)
 delete mode 100644 jjb/scripts/vpp/clang-build.sh
 create mode 100644 jjb/scripts/vpp/debug-build.sh

diff --git a/jjb/scripts/vpp/clang-build.sh b/jjb/scripts/vpp/clang-build.sh
deleted file mode 100644
index b1bed417..00000000
--- a/jjb/scripts/vpp/clang-build.sh
+++ /dev/null
@@ -1,40 +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
-
-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
-
-make UNATTENDED=yes install-dep
-make UNATTENDED=yes install-ext-deps
-make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp_clang CC=clang CXX=clang install-packages
-make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp_clang CC=clang CXX=clang sample-plugin-install
-make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp_clang CC=clang CXX=clang libmemif-install
-
-
-echo "*******************************************************************"
-echo "* VPP CLANG BUILD SUCCESSFULLY COMPLETED"
-echo "*******************************************************************"
diff --git a/jjb/scripts/vpp/debug-build.sh b/jjb/scripts/vpp/debug-build.sh
new file mode 100644
index 00000000..cdf1d076
--- /dev/null
+++ b/jjb/scripts/vpp/debug-build.sh
@@ -0,0 +1,49 @@
+#!/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
+
+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
+
+
+# run with ASAN on
+# export VPP_EXTRA_CMAKE_ARGS='-DVPP_ENABLE_SANITIZE_ADDR=ON'
+
+# clang is not working with ASAN right now - see change 27268
+# apparently gcc neither...
+# export CC=gcc
+
+
+
+make UNATTENDED=yes install-dep
+make UNATTENDED=yes install-ext-deps
+make UNATTENDED=yes build
+make UNATTENDED=yes TEST_JOBS=auto test-debug
+
+
+echo "*******************************************************************"
+echo "* VPP debug/asan test BUILD SUCCESSFULLY COMPLETED"
+echo "*******************************************************************"
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index dacd6850..bfd0ddd9 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -3,6 +3,7 @@
     name: vpp
     jobs:
       - 'vpp-verify-{stream}-{os}'
+      - 'vpp-verify-{stream}-debug'
       - 'vpp-merge-{stream}-{os}'
 
     project: 'vpp'
@@ -49,7 +50,6 @@
 - project:
     name: vpp-clang
     jobs:
-      - 'vpp-verify-{stream}-clang'
       - 'vpp-coverity-{stream}'
 
     project: 'vpp'
@@ -744,7 +744,7 @@
           maven-version: 'mvn36'
 
 - job-template:
-    name: 'vpp-verify-{stream}-clang'
+    name: 'vpp-verify-{stream}-debug'
 
     project-type: freestyle
     node: 'ubuntu1804-us'
@@ -770,6 +770,7 @@
           stream: '{stream}'
       - make-parallel-jobs-parameter:
           make-parallel-jobs: '{make-parallel-jobs}'
+      - gerrit-refspec-parameter
 
     scm:
       - gerrit-trigger-scm:
@@ -795,7 +796,7 @@
           - ../scripts/setup_vpp_dpdk_dev_env.sh
       - shell:
           !include-raw-escape:
-          - ../scripts/vpp/clang-build.sh
+          - ../scripts/vpp/debug-build.sh
 
     publishers:
       - fdio-infra-shiplogs:
-- 
cgit 1.2.3-korg