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

diff --git a/jjb/scripts/vpp/clang-build.sh b/jjb/scripts/vpp/debug-build.sh
similarity index 73%
rename from jjb/scripts/vpp/clang-build.sh
rename to jjb/scripts/vpp/debug-build.sh
index b1bed41..cdf1d07 100644 (file)
--- a/jjb/scripts/vpp/clang-build.sh
+++ b/jjb/scripts/vpp/debug-build.sh
@@ -28,13 +28,22 @@ 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 -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
+make UNATTENDED=yes build
+make UNATTENDED=yes TEST_JOBS=auto test-debug
 
 
 echo "*******************************************************************"
-echo "* VPP CLANG BUILD SUCCESSFULLY COMPLETED"
+echo "* VPP debug/asan test BUILD SUCCESSFULLY COMPLETED"
 echo "*******************************************************************"

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index dacd685..bfd0ddd 100644 (file)
--- 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: