diff options
| -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 bc9a5458..d7026719 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 @@ -111,6 +124,7 @@ projects: # template: # - name: default-jobs -# - name: vpp -# template: -# - name: default-jobs + - name: vpp + check-novote: + - vpp-csit-verify-virl + |