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:04:22 +0100 |
| commit | 34e4e2aadd94d7d656824c9055ed9671044612c6 (patch) | |
| tree | 23f3c71e895a22fc6520b683d7d0ec0320036bf5 /jjb | |
| parent | 1c3015a8420e2bbfdd748dbfc233964510e62f5c (diff) | |
Move csit-vpp-functional-virl to zuul.
Change-Id: I240b93105039e8838f711f545eafd95f354bee16
Signed-off-by: Stefan Kobza <skobza@cisco.com>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/csit/csit-vpp-functional.yaml | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/jjb/csit/csit-vpp-functional.yaml b/jjb/csit/csit-vpp-functional.yaml index c2da4dafa..b0ac18602 100644 --- a/jjb/csit/csit-vpp-functional.yaml +++ b/jjb/csit/csit-vpp-functional.yaml @@ -3,18 +3,17 @@ description: 'Run VPP functional tests on VIRL.' jobs: - - 'csit-vpp-{functionality}' + - 'csit-vpp-functional-virl' project: 'csit' branch: 'master' - functionality: 'functional-virl' - job-template: - name: 'csit-vpp-{functionality}' + name: 'csit-vpp-functional-virl' project-type: freestyle - node: verify + node: verify_merge concurrent: false logrotate: @@ -23,47 +22,18 @@ artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - string: - name: 'VPP_URLS' - default: '' - description: 'Space separated VPP *.deb URLs from nexus' - scm: - - gerrit-trigger-scm: + - zuul-trigger-scm: credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + refspec: '$ZUUL_REF' + commit: '$ZUUL_COMMIT' wrappers: - ssh-agent-credentials: users: - '{ssh-credentials}' - # - jclouds: - # instances: - # - multi-link: - # cloud-name: 'Primary' - # count: 3 - # stop-on-terminate: False - - # TODO: Rewrite following trigger. Whis job has to be triggered by - # VPP verification build. This job requires built VPP DEBs. - # Until CSIT is fully integrated with VIRL & HW lab, trigger this build by - # csit patch submit. - triggers: - - gerrit-trigger-patch-submitted: - name: '{project}' - branch: '{branch}' - builders: - # This is where we will need to insert a step with a script that pulls all the - # allocated IP addresses and injecting as vars into the env. (see Opendaylight script: include-raw-integration-get-slave-addresses.sh - # See jjb/integration from ODL - shell: !include-raw-escape include-raw-csit-vpp-functional-virl.sh |