Add a vpp-verify-{stream}-{os}-clang job

Fixed to have vpp clang job use make verify

Change-Id: Ic59713a72af156fd9a32ac9f43e96c36b3ece6b6
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 7222215..626571b 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -65,6 +65,14 @@
             default: '{repo-name}'
             description: 'Name of repo to which to publish packaging'
 
+- parameter:
+    name: compiler-parameter
+    parameters:
+        - string:
+            name: CC
+            default: '{cc}'
+            description: "CC parameter, can be gnu or clang"
+
 
 ##### SCMS
 - scm:

diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh
index 2b9cd1e..a838f57 100644 (file)
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -45,7 +45,7 @@ if [ "x${VPP_REPO}" == "x1" ]; then
         exit 1
     fi
 fi
-
+echo "CC=${CC}"
 build-root/vagrant/build.sh
 
 echo "*******************************************************************"

diff --git a/jjb/vpp/include-raw-vpp-clang-build.sh b/jjb/vpp/include-raw-vpp-clang-build.sh
new file mode 100644 (file)
index 0000000..d4b865b
--- /dev/null
+++ b/jjb/vpp/include-raw-vpp-clang-build.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# basic build script example
+set -xe -o pipefail
+# 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}"
+make UNATTENDED=y verify
+
+echo "*******************************************************************"
+echo "* VPP BUILD SUCCESSFULLY COMPLETED"
+echo "*******************************************************************"
\ No newline at end of file

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index d16e1a1..b4b0eca 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -2,6 +2,7 @@
     name: vpp
     jobs:
         - 'vpp-verify-{stream}-{os}'
+        - 'vpp-verify-{stream}-{os}-clang'
         - 'vpp-merge-{stream}-{os}'
         - 'vpp-verify-image-{stream}-{os}'
         - 'vpp-docs-merge-{stream}'
@@ -108,6 +109,57 @@
             only-if-success: true
             default-excludes: false
 
+- job-template:
+    name: 'vpp-verify-{stream}-{os}-clang'
+
+    project-type: freestyle
+    node: 'verify-{os}'
+    concurrent: true
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
+        - compiler-parameter:
+            cc: 'clang'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: '{project}'
+            branch: '{branch}'
+
+    builders:
+        - shell:
+            !include-raw-escape: include-raw-vpp-checkstyle.sh
+        - shell:
+            !include-raw-escape: include-raw-vpp-clang-build.sh
+    publishers:
+        - archive:
+            artifacts: 'build-root/*.rpm,build-root/*.deb'
+            allow-empty: 'true'
+            fingerprint: false
+            only-if-success: true
+            default-excludes: false
+
 - job-template:
     name: 'vpp-csit-verify-virl-1604-test-{stream}'