From 24d308628d0cf57222375894209a72e7ce23af25 Mon Sep 17 00:00:00 2001 From: Stefan Kobza Date: Tue, 9 Feb 2016 15:01:26 +0100 Subject: Rework CSIT jobs - 1 validates CSIT commits, 1 tests vpp debs. Change-Id: I6e8b78fec5b458cfdac6864617cdbd342b6f0594 Signed-off-by: Stefan Kobza --- jjb/csit/csit-vpp-bridge-domain.yaml | 62 ---------------------------------- jjb/csit/csit-vpp-functional.yaml | 64 ++++++++++++++++++++++++++++++++++++ jjb/csit/csit-vpp-pylint.yaml | 62 ++++++++++++++++++++++++++++++++++ jjb/csit/include-raw-csit-pylint.sh | 5 +++ 4 files changed, 131 insertions(+), 62 deletions(-) delete mode 100644 jjb/csit/csit-vpp-bridge-domain.yaml create mode 100644 jjb/csit/csit-vpp-functional.yaml create mode 100644 jjb/csit/csit-vpp-pylint.yaml create mode 100644 jjb/csit/include-raw-csit-pylint.sh (limited to 'jjb') diff --git a/jjb/csit/csit-vpp-bridge-domain.yaml b/jjb/csit/csit-vpp-bridge-domain.yaml deleted file mode 100644 index 5b8556374..000000000 --- a/jjb/csit/csit-vpp-bridge-domain.yaml +++ /dev/null @@ -1,62 +0,0 @@ -- project: - name: csit-vpp-bridge-domain - - jobs: - - 'csit-vpp-{functionality}' - - project: 'csit' - branch: 'master' - - functionality: 'bridge-domain' - -- job-template: - name: 'csit-vpp-{functionality}' - - project-type: freestyle - node: verify - 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}' - - scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - - jclouds: - instances: - - multi-link: - cloud-name: 'Primary' - count: 3 - stop-on-terminate: False - - 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-build.sh - - publishers: - - archive-artifacts: - artifacts: 'build-root/**' diff --git a/jjb/csit/csit-vpp-functional.yaml b/jjb/csit/csit-vpp-functional.yaml new file mode 100644 index 000000000..df2ec0264 --- /dev/null +++ b/jjb/csit/csit-vpp-functional.yaml @@ -0,0 +1,64 @@ +- project: + name: csit-vpp-functional + + jobs: + - 'csit-vpp-{functionality}' + + project: 'csit' + branch: 'master' + + functionality: 'functional' + +- job-template: + name: 'csit-vpp-{functionality}' + + project-type: freestyle + node: verify + 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}' + - string: + name: 'VPP_URLS' + default: '' + description: 'Space separated VPP *.deb URLs from nexus' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + # - jclouds: + # instances: + # - multi-link: + # cloud-name: 'Primary' + # count: 3 + # stop-on-terminate: False + + # No triggers section, as it is expected that his job is triggered by + # vpp verify/merge job. + + 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-build.sh + + publishers: + - archive-artifacts: + artifacts: 'report.html, log.html, output.xml' diff --git a/jjb/csit/csit-vpp-pylint.yaml b/jjb/csit/csit-vpp-pylint.yaml new file mode 100644 index 000000000..c04beb63b --- /dev/null +++ b/jjb/csit/csit-vpp-pylint.yaml @@ -0,0 +1,62 @@ +- project: + name: csit-validate + + jobs: + - 'csit-validate-{functionality}' + + project: 'csit' + branch: 'master' + + functionality: 'pylint' + +- job-template: + name: 'csit-vpp-{functionality}' + + project-type: freestyle + node: verify + 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}' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + - jclouds: + instances: + - multi-link: + cloud-name: 'Primary' + count: 3 + stop-on-terminate: False + + 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-pylint.sh + + publishers: + - archive-artifacts: + artifacts: 'build-root/**' diff --git a/jjb/csit/include-raw-csit-pylint.sh b/jjb/csit/include-raw-csit-pylint.sh new file mode 100644 index 000000000..e68088481 --- /dev/null +++ b/jjb/csit/include-raw-csit-pylint.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +find resources -name \*.py | xargs pylint --rcfile=pylint.cfg > pylint.log || true + +# vim: ts=4 ts=4 sts=4 et : -- cgit 1.2.3-korg