diff options
| -rw-r--r-- | jjb/csit/csit-vpp-pylint.yaml | 4 | ||||
| -rw-r--r-- | jjb/csit/csit.yaml | 204 |
2 files changed, 133 insertions, 75 deletions
diff --git a/jjb/csit/csit-vpp-pylint.yaml b/jjb/csit/csit-vpp-pylint.yaml index 565d1426d..c30667ff8 100644 --- a/jjb/csit/csit-vpp-pylint.yaml +++ b/jjb/csit/csit-vpp-pylint.yaml @@ -9,10 +9,6 @@ stream: - master: branch: 'master' - - '1606': - branch: 'rls1606' - - '1609': - branch: 'rls1609' - job-template: name: 'csit-validate-pylint-{stream}' diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 42f159c4c..842064faf 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -34,10 +34,11 @@ - 'csit-docs-merge-{stream_timed}' - 'csit-docs-verify-{stream}' - 'csit-report-merge-{stream}' - - 'csit-report-merge-1801_2' - 'csit-trending-daily-master' - 'csit-dpdk-perf-verify-{stream}-{topo}-{arch}' - 'csit-dpdk-perf-mrr-weekly-master' + - 'csit-dpdk-perf-mrr-weekly-master-2n-skx' + - 'csit-dpdk-perf-mrr-weekly-master-3n-skx' - 'csit-ligato-perf-{stream}-{type}' - 'csit-vpp-perf-mrr-daily-master' - 'csit-vpp-perf-mrr-daily-master-2n-skx' @@ -648,7 +649,7 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-report-merge-1801_2' + name: 'csit-trending-daily-master' project-type: freestyle node: 'ubuntu1604-basebuild-8c-32g' @@ -664,14 +665,14 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'rls1801_2' + branch: '{branch}' - maven-exec: maven-version: 'mvn33-new' scm: - gerrit-trigger-scm: credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' + refspec: '' choosing-strategy: 'default' wrappers: @@ -679,22 +680,9 @@ build-timeout: '{build-timeout}' triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'run-report' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/rls1801_2' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true + - reverse: + jobs: 'csit-vpp-perf-mrr-daily-master' + result: 'failure' builders: - maven-target: @@ -708,24 +696,34 @@ settings-file: 'csit-settings' global-settings-file: 'global-settings' - shell: - !include-raw-escape: include-raw-csit-report.sh + !include-raw-escape: include-raw-csit-cpta.sh publishers: - - archive: - artifacts: 'resources/tools/presentation/csit.report.tar.gz' - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - - fdio-infra-shiplogs: maven-version: 'mvn33-new' - job-template: - name: 'csit-trending-daily-master' + name: 'csit-vpp-perf-ndrpdr-weekly-master-3n-hsw' + description: | + <ul> + <li>objective + <ul> + <li>check vpp perf ndrpdr weekly on 3n-hsw + </ul> + <li>perf test-cases selection + <ul> + <li>pre-selected CSIT VPP NDRPDR perf suites + </ul> + <li>results + <ul> + <li>jjb verify: PASS/FAIL + <li>present: no + <li>analyse: csit project (catch malfunctions/degradations) + </ul> + </ul> project-type: freestyle - node: 'ubuntu1604-basebuild-8c-32g' + node: 'ubuntu1604-basebuild-4c-4g' concurrent: false logrotate: @@ -739,50 +737,42 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - maven-exec: - maven-version: 'mvn33-new' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '' - choosing-strategy: 'default' wrappers: - fdio-infra-wrappers-non-activity-timeout: build-timeout: '{build-timeout}' triggers: - - reverse: - jobs: 'csit-vpp-perf-mrr-daily-master' - result: 'failure' + - timed: '0 0 * * 6' builders: - - maven-target: - maven-version: 'mvn33-new' - goals: '--version' - settings: 'csit-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - provide-maven-settings: - settings-file: 'csit-settings' - global-settings-file: 'global-settings' + - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' + - inject: + properties-file: variables.prop - shell: - !include-raw-escape: include-raw-csit-cpta.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh publishers: + - archive-artifacts: + artifacts: 'csit/archive/*.*' + latest-only: false + + - robot: + output-path: 'csit/archive' + other-files: + - '*.*' + - fdio-infra-shiplogs: maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-ndrpdr-weekly-master-3n-hsw' + name: 'csit-vpp-perf-ndrpdr-weekly-master-2n-skx' description: | <ul> <li>objective <ul> - <li>check vpp perf ndrpdr weekly on 3n-hsw + <li>check vpp perf ndrpdr weekly </ul> <li>perf test-cases selection <ul> @@ -839,7 +829,7 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-ndrpdr-weekly-master-2n-skx' + name: 'csit-vpp-perf-ndrpdr-weekly-master-3n-skx' description: | <ul> @@ -902,17 +892,17 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-ndrpdr-weekly-master-3n-skx' + name: 'csit-vpp-perf-mrr-daily-master' description: | <ul> <li>objective <ul> - <li>check vpp perf ndrpdr weekly + <li>check vpp perf mrr daily </ul> <li>perf test-cases selection <ul> - <li>pre-selected CSIT VPP NDRPDR perf suites + <li>all CSIT VPP MRR perf suites </ul> <li>results <ul> @@ -921,9 +911,10 @@ <li>analyse: csit project (catch malfunctions/degradations) </ul> </ul> + project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' - concurrent: false + concurrent: true logrotate: daysToKeep: '{build-days-to-keep}' @@ -942,7 +933,7 @@ build-timeout: '{build-timeout}' triggers: - - timed: '0 0 * * 6' + - timed: '0 2,16 * * *' builders: - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' @@ -961,11 +952,15 @@ other-files: - '*.*' + - trigger: + project: 'csit-trending-daily-master' + threshold: 'FAILURE' + - fdio-infra-shiplogs: maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-mrr-daily-master' + name: 'csit-vpp-perf-mrr-daily-master-2n-skx' description: | <ul> @@ -1033,7 +1028,7 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-mrr-daily-master-2n-skx' + name: 'csit-vpp-perf-mrr-daily-master-3n-skx' description: | <ul> @@ -1074,8 +1069,7 @@ build-timeout: '{build-timeout}' triggers: - # - timed: '0 2,16 * * *' - - timed: '0 16 * * 1,3,5' + - timed: '0 2,16 * * *' builders: - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' @@ -1102,17 +1096,17 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-mrr-daily-master-3n-skx' + name: 'csit-dpdk-perf-mrr-weekly-master' description: | <ul> <li>objective <ul> - <li>check vpp perf mrr daily + <li>check dpdk perf mrr weekly </ul> <li>perf test-cases selection <ul> - <li>all CSIT VPP MRR perf suites + <li>all CSIT DPDK MRR perf suites </ul> <li>results <ul> @@ -1124,7 +1118,7 @@ project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' - concurrent: true + concurrent: false logrotate: daysToKeep: '{build-days-to-keep}' @@ -1143,8 +1137,7 @@ build-timeout: '{build-timeout}' triggers: - # - timed: '0 2,16 * * *' - - timed: '0 16 * * 1,3,5' + - timed: '0 0 * * 6' builders: - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' @@ -1171,7 +1164,75 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-dpdk-perf-mrr-weekly-master' + name: 'csit-dpdk-perf-mrr-weekly-master-2n-skx' + + description: | + <ul> + <li>objective + <ul> + <li>check dpdk perf mrr weekly + </ul> + <li>perf test-cases selection + <ul> + <li>all CSIT DPDK MRR perf suites + </ul> + <li>results + <ul> + <li>jjb verify: PASS/FAIL + <li>present: no + <li>analyse: csit project (catch malfunctions/degradations) + </ul> + </ul> + + project-type: freestyle + node: 'ubuntu1604-basebuild-4c-4g' + 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}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + + wrappers: + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: '{build-timeout}' + + triggers: + - timed: '0 0 * * 6' + + builders: + - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' + - inject: + properties-file: variables.prop + - shell: + !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh + + publishers: + - archive-artifacts: + artifacts: 'csit/archive/*.*' + latest-only: false + + - robot: + output-path: 'csit/archive' + other-files: + - '*.*' + + - trigger: + project: 'csit-trending-daily-master' + threshold: 'FAILURE' + + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'csit-dpdk-perf-mrr-weekly-master-3n-skx' description: | <ul> @@ -1238,6 +1299,7 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' + - job-template: name: 'csit-vpp-perf-verify-{stream}-{topo}-{arch}' |