X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit.yaml;h=42f159c4c9935f7e569cc60af4176491c77a9a7f;hb=95a8c42349da54996cdc2c747d5d52b0ffed2e0d;hp=e5f63b66a024bff6031c960c1e0c8aede7381647;hpb=0be5e0b700dd8d47484a400eddff2e1875ccdd36;p=ci-management.git diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index e5f63b66a..42f159c4c 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -36,14 +36,15 @@ - 'csit-report-merge-{stream}' - 'csit-report-merge-1801_2' - 'csit-trending-daily-master' - - 'csit-dpdk-perf-{stream}-{type}' - 'csit-dpdk-perf-verify-{stream}-{topo}-{arch}' - 'csit-dpdk-perf-mrr-weekly-master' - 'csit-ligato-perf-{stream}-{type}' - - 'csit-vpp-perf-{stream}-{type}' - - 'csit-vpp-perf-trend-daily-master' - - 'csit-vpp-perf-trend-semi-weekly-master' - 'csit-vpp-perf-mrr-daily-master' + - 'csit-vpp-perf-mrr-daily-master-2n-skx' + - 'csit-vpp-perf-mrr-daily-master-3n-skx' + - 'csit-vpp-perf-ndrpdr-weekly-master-3n-hsw' + - 'csit-vpp-perf-ndrpdr-weekly-master-2n-skx' + - 'csit-vpp-perf-ndrpdr-weekly-master-3n-skx' - 'csit-vpp-perf-verify-{stream}-{topo}-{arch}' - 'csit-nsh_sfc-verify-perf-{stream}' - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl' @@ -64,12 +65,6 @@ - master: branch: 'master' branch-id: 'oper' - - '1707': - branch: 'rls1707' - branch-id: 'oper-rls1707' - - '1710': - branch: 'rls1710' - branch-id: 'oper-rls1710' - '1801': branch: 'rls1801' branch-id: 'oper-rls1801' @@ -130,60 +125,6 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' -- job-template: - name: 'csit-dpdk-perf-{stream}-{type}' - - project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' - 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}' - - type-parameter: - type: '{type}' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - fdio-infra-wrappers-non-activity-timeout: - build-timeout: '{build-timeout}' - - triggers: - - gerrit-trigger-manually-triggered: - name: '{project}' - branch: '{branch}' - comment-trigger-value: 'verify-perf-dpdk-{type}' - - builders: - - shell: - !include-raw-escape: jjb/csit/include-raw-csit-dpdk-perf-hw.sh - - publishers: - - archive-artifacts: - artifacts: 'archive/*.*' - latest-only: false - - - robot: - output-path: archive - other-files: - - '*.*' - - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - - job-template: name: 'csit-dpdk-perf-verify-{stream}-{topo}-{arch}' @@ -267,61 +208,7 @@ builders: - shell: - !include-raw-escape: jjb/csit/include-raw-csit-dpdk-perf-verify.sh - - publishers: - - archive-artifacts: - artifacts: 'archive/*.*' - latest-only: false - - - robot: - output-path: archive - other-files: - - '*.*' - - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - -- job-template: - name: 'csit-vpp-perf-{stream}-{type}' - - project-type: freestyle - node: 'ubuntu1604-basebuild-8c-32g' - 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}' - - type-parameter: - type: '{type}' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - fdio-infra-wrappers-non-activity-timeout: - build-timeout: '{build-timeout}' - - triggers: - - gerrit-trigger-manually-triggered: - name: '{project}' - branch: '{branch}' - comment-trigger-value: 'verify-perf-{type}' - - builders: - - shell: - !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-hw.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh publishers: - archive-artifacts: @@ -375,7 +262,7 @@ builders: - shell: - !include-raw-escape: jjb/csit/include-raw-csit-ligato-perf-hw.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh publishers: - archive-artifacts: @@ -889,32 +776,25 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-trend-daily-master' + name: 'csit-vpp-perf-ndrpdr-weekly-master-3n-hsw' description: | - Purpose of this job is to validate latest vpp build from corresponding - branch stored in nexus against verified CSIT codebase of corresponding - branch. - - objective - daily perf trending of vpp master build - job - name - csit-vpp-perf-trend-daily - trigger - scheduled daily - perf test-cases selection - all CSIT perf suites - default tags for vpp startup config and perf test type - 1T1C - one worker thread, one core - 2T2C - two worker threads, two cores - X520 - Intel x520-DA2 NIC - NDRDISC - discovery of NDR throughput - results - jjb verify - no - present - jenkins trending graphs - + project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' concurrent: false @@ -935,12 +815,15 @@ - 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-vpp-perf-trend-daily.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh publishers: - archive-artifacts: @@ -956,34 +839,88 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-trend-semi-weekly-master' + name: 'csit-vpp-perf-ndrpdr-weekly-master-2n-skx' description: | - Purpose of this job is to validate latest vpp build from corresponding - branch stored in nexus against verified CSIT codebase of corresponding - branch. - - consumer - csit-dev trending semi-weekly - objective - semi-weekly perf trending of vpp master build job - name - csit-vpp-perf-trend-semi-weekly - trigger - scheduled semi-weekly - perf test-cases selection - all CSIT perf suites - default tags for vpp startup config and perf test type - 1T1C - one worker thread, one core - 2T2C - two worker threads, two cores - X710 - Intel x710 Fortville NIC - XL710 - Intel xl710 Fortville NIC - NDRDISC - discovery of NDR throughput - results - jjb verify - no - present - jenkins trending graphs + + 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: + - '*.*' + + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'csit-vpp-perf-ndrpdr-weekly-master-3n-skx' + description: | + project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' concurrent: false @@ -1004,12 +941,15 @@ - 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-vpp-perf-trend-semi-weekly.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh publishers: - archive-artifacts: @@ -1028,24 +968,22 @@ name: 'csit-vpp-perf-mrr-daily-master' description: | - objective - check vpp perf mrr daily - job - name - csit-vpp-perf-mrr-daily - trigger - twice a day - perf test-cases selection - all CSIT MRR perf suites - results - jjb verify - PASS/FAIL - present - no - analyse - csit project - catch malfunctions - catch degradations + project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' @@ -1075,7 +1013,145 @@ - inject: properties-file: variables.prop - shell: - !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-mrr-daily.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: + - '*.*' + + - trigger: + project: 'csit-trending-daily-master' + threshold: 'FAILURE' + + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'csit-vpp-perf-mrr-daily-master-2n-skx' + + description: | + + + project-type: freestyle + node: 'ubuntu1604-basebuild-4c-4g' + 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}' + + wrappers: + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: '{build-timeout}' + + triggers: + # - timed: '0 2,16 * * *' + - timed: '0 16 * * 1,3,5' + + 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-vpp-perf-mrr-daily-master-3n-skx' + + description: | + + + project-type: freestyle + node: 'ubuntu1604-basebuild-4c-4g' + 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}' + + wrappers: + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: '{build-timeout}' + + triggers: + # - timed: '0 2,16 * * *' + - timed: '0 16 * * 1,3,5' + + 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: @@ -1098,24 +1174,22 @@ name: 'csit-dpdk-perf-mrr-weekly-master' description: | - objective - check dpdk perf mrr weekly - job - name - csit-dpdk-perf-mrr-weekly-master - trigger - weekly - perf test-cases selection - all CSIT DPDK MRR perf suites - results - jjb verify - PASS/FAIL - present - no - analyse - csit project - catch malfunctions - catch degradations + project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' @@ -1145,7 +1219,7 @@ - inject: properties-file: variables.prop - shell: - !include-raw-escape: jjb/csit/include-raw-csit-dpdk-perf-mrr-weekly.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh publishers: - archive-artifacts: @@ -1252,7 +1326,7 @@ builders: - shell: - !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-verify.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh publishers: - archive-artifacts: