diff options
author | Stefan Kobza <skobza@cisco.com> | 2016-02-25 14:36:26 +0100 |
---|---|---|
committer | Stefan Kobza <skobza@cisco.com> | 2016-02-29 13:06:03 +0100 |
commit | a41a6e0bee61fc1d6df5be50300ae58b2d59a7ea (patch) | |
tree | c9084ef8c9eba00087d7aab7d5fb475317f629a7 | |
parent | 1c3015a8420e2bbfdd748dbfc233964510e62f5c (diff) |
Add vpp jenkins job to build vpp and run csit tests.
To start integrating with VPP verify job, start csit tests for each VPP
verify run. Until artifacts passing is solved between jenkins upstream
and downstream jobs, build the VPP project again in this job. Then
check out csit project, copy the deb packages to the cloned dir and
start the testcase.
Prevent the job non-voting, so that it does not polute VPP reviews with
erroneous results. We'll switch to normal voting after all potential
problems are ironed out, and the job is stable.
Change-Id: I9e35e19a1d8b2a64b8e65473fef93e0b537eded2
Signed-off-by: Stefan Kobza <skobza@cisco.com>
-rw-r--r-- | jjb/vpp/include-raw-vpp-csit-functional.sh | 21 | ||||
-rw-r--r-- | jjb/vpp/vpp.yaml | 40 | ||||
-rw-r--r-- | zuul/layout.yaml | 20 |
3 files changed, 78 insertions, 3 deletions
diff --git a/jjb/vpp/include-raw-vpp-csit-functional.sh b/jjb/vpp/include-raw-vpp-csit-functional.sh new file mode 100644 index 00000000..e0767c64 --- /dev/null +++ b/jjb/vpp/include-raw-vpp-csit-functional.sh @@ -0,0 +1,21 @@ +#!/bin/bash +set -xeu -o pipefail + +# Clone csit and start tests +git clone https://gerrit.fd.io/r/csit + +cp build-root/*.deb csit/ +cd csit +# execute csit bootstrap script if it exists +if [ -e bootstrap.sh ] +then + # make sure that bootstrap.sh is executable + chmod +x bootstrap.sh + # run the script + ./bootstrap.sh *.deb +else + echo 'ERROR: No bootstrap.sh found' + exit 1 +fi + +# vim: ts=4 ts=4 sts=4 et : diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index caafe1a5..3283832a 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -3,6 +3,7 @@ jobs: - 'vpp-verify' - 'vpp-merge' + - 'vpp-csit-verify-virl' project: 'vpp' branch: 'master' @@ -97,3 +98,42 @@ - shell: !include-raw-escape include-raw-vpp-maven-push.sh +- job-template: + name: 'vpp-csit-verify-virl' + + project-type: freestyle + node: verify-merge + concurrent: false + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + scm: + - zuul-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$ZUUL_REF' + commit: '$ZUUL_COMMIT' + + wrappers: + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + + builders: + - shell: + !include-raw-escape include-raw-vpp-build.sh + - shell: + !include-raw-escape include-raw-vpp-csit-functional.sh + + + publishers: + - archive-artifacts: + artifacts: 'csit/report.html, csit/log.html, csit/output.xml' + latest-only: false + + - robot-report: + output-path: 'csit' + diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 1be239c2..8cfc7d9e 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -19,6 +19,19 @@ pipelines: failure: gerrit: verified: -1 + - name: check-novote + source: gerrit + manager: IndependentPipelineManager + trigger: + gerrit: + - event: patchset-created + - event: draft-published + - event: comment-added + comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*(recheck|reverify) + success: + gerrit: {} + failure: + gerrit: {} # - name: gate # source: gerrit # manager: DependentPipelineManager @@ -109,6 +122,7 @@ projects: # template: # - name: default-jobs -# - name: vpp -# template: -# - name: default-jobs + - name: vpp + check-novote: + - vpp-csit-verify-virl + |