From: Ed Warnicke Date: Fri, 11 Nov 2016 21:41:57 +0000 (-0500) Subject: Add a vpp-verify-{stream}-{os}-clang job X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=61f46f6471fac2bdb09c6e9fb23eaceb4122a433;hp=b7dcf868c2d994810b8f67745ed58e245b68f978;p=ci-management.git Add a vpp-verify-{stream}-{os}-clang job Change-Id: Ic71029c36a2f3bab65e9bcd36a711b4d2b417577 Signed-off-by: Ed Warnicke --- diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 7222215b2..626571b3e 100644 --- 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 2b9cd1e83..a838f576b 100644 --- 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/vpp.yaml b/jjb/vpp/vpp.yaml index d16e1a1d8..d690fd7df 100644 --- 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-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}'