diff options
| author |   Thomas F Herbert <therbert@redhat.com> | 2017-01-05 19:45:42 -0500 |
|---|---|---|
| committer | Thomas F Herbert <therbert@redhat.com> | 2017-02-08 12:42:20 -0500 |
| commit | 043e5950c343f3395c7b9baff4f683ab0e6730aa (patch) | |
| tree | 29f8814b7af8c5d4ef5ffa862538887a85cf7773 | |
| parent | ebd839d8029ced6ad18adedd91ed2caa0973e30e (diff) | |
Add support for Centos7.3-1611 to csit jobs.
Remove operational branch creation from weekly
verify job. Split vpp changes for Centos into
separate commit. Do not add os param to perf
jobs so as not to destroy perf trend history.
JIRA: CSIT-356
Change-Id: If0121f01fa0767eae96e5f9f14ed4c56a97e7f7f
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
| -rw-r--r-- | jjb/csit/csit.yaml | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 2c0246389..0a2e22c00 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -1,13 +1,16 @@ - project: name: csit description: 'CSIT jenkins jobs.' + os: + - 'ubuntu1604' + - 'centos7' jobs: - 'csit-dpdk-perf-{stream}-{type}' - 'csit-vpp-perf-{stream}-{type}' - - 'csit-vpp-functional-{stream}-virl' - - 'csit-vpp-verify-{stream_timed}-weekly' - - 'csit-vpp-verify-{stream_timed}-semiweekly' + - 'csit-vpp-functional-{stream}-{os}-virl' + - 'csit-vpp-verify-{stream_timed}-{os}-weekly' + - 'csit-vpp-verify-{stream_timed}-{os}-semiweekly' - 'csit-vpp-verify-perf-master-nightly-all' - 'csit-docs-merge-{stream}' - 'csit-docs-verify-{stream}' @@ -43,10 +46,10 @@ - job-template: - name: 'csit-vpp-functional-{stream}-virl' + name: 'csit-vpp-functional-{stream}-{os}-virl' project-type: freestyle - node: ubuntu1604-basebuild-4c-4g + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -95,7 +98,7 @@ name: 'csit-dpdk-perf-{stream}-{type}' project-type: freestyle - node: ubuntu1604-basebuild-4c-4g + node: 'ubuntu1604-basebuild-4c-4g' concurrent: false logrotate: @@ -147,7 +150,7 @@ name: 'csit-vpp-perf-{stream}-{type}' project-type: freestyle - node: ubuntu1604-basebuild-4c-4g + node: 'ubuntu1604-basebuild-4c-4g' concurrent: false logrotate: @@ -1263,11 +1266,11 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-verify-{stream_timed}-weekly' - description: 'Purpose of this job is to validate CSIT code of corresponding branch against verified vpp build from corresponding branch and create corresponding operational branch in case of success.' + name: 'csit-vpp-verify-{stream_timed}-{os}-weekly' + description: 'Purpose of this job is to validate CSIT code of corresponding branch against verified vpp build from corresponding branch.' project-type: freestyle - node: ubuntu1604-basebuild-4c-4g + node: '{os}-basebuild-4c-4g' concurrent: false logrotate: @@ -1302,9 +1305,6 @@ builders: - shell: !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-weekly.sh - - shell: 'echo "DATE=`date +%y%m%d`" > $WORKSPACE/variables.prop' - - inject: - properties-file: variables.prop publishers: - archive-artifacts: @@ -1313,22 +1313,16 @@ - robot-report: output-path: '' - - git: - push-only-if-success: true - branches: - - branch: - remote: origin - name: 'refs/heads/{branch-id}-$DATE' - fdio-infra-shiplogs: maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-verify-{stream_timed}-semiweekly' + name: 'csit-vpp-verify-{stream_timed}-{os}-semiweekly' description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.' project-type: freestyle - node: ubuntu1604-basebuild-4c-4g + node: '{os}-basebuild-4c-4g' concurrent: false logrotate: @@ -1378,7 +1372,7 @@ description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.' project-type: freestyle - node: ubuntu1604-basebuild-4c-4g + node: 'ubuntu1604-basebuild-4c-4g' concurrent: false logrotate: |