X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit.yaml;h=e96f8d8068ac353ad4840fb62d1356cd581257b5;hb=e441518b23a5a1fe554347cc3a4982072be84eab;hp=3eb0c9ba4b15d7cabfa5277be7cebb6a1c1e0bda;hpb=d49ca9de3830033a39fa1862e5d6e2494edc9d62;p=ci-management.git diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 3eb0c9ba4..e96f8d806 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -20,9 +20,6 @@ - 'centos7' jobs: - - 'csit-dpdk-perf-{stream}-{type}' - - 'csit-vpp-perf-{stream}-{type}' - - 'csit-ligato-perf-{stream}-{type}' - 'csit-vpp-functional-{stream}-{os}-virl' - 'csit-vpp-verify-{stream_timed}-{os}-weekly' - 'csit-vpp-verify-{stream_timed}-{os}-semiweekly' @@ -31,14 +28,18 @@ - 'csit-report-merge-{stream}' - 'csit-report-merge-1801_2' - 'csit-trending-daily-master' + - 'csit-dpdk-perf-{stream}-{type}' + - '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-check-{stream}' - 'csit-vpp-perf-mrr-daily-master' - 'csit-vpp-perf-verify-{stream}' - 'csit-nsh_sfc-verify-perf-{stream}' - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl' - 'csit-tldk-verify-func-{stream}-{os}-virl' + - 'csit-dmm-functional-{stream}-{os}-virl' project: 'csit' branch: 'master' @@ -640,7 +641,7 @@ publishers: - archive: - artifacts: 'resources/tools/report_gen/csit.report.tar.gz' + artifacts: 'resources/tools/presentation/csit.report.tar.gz' allow-empty: 'true' fingerprint: false only-if-success: true @@ -914,30 +915,18 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-check-{stream}' + name: 'csit-vpp-perf-mrr-daily-master' description: | - consumer - csit-dev perf code base checks objective - check csit perf code base + check vpp perf mrr daily job name - csit-vpp-perf-check + csit-vpp-perf-mrr-daily trigger - see below + twice a day perf test-cases selection - all CSIT perf suites - keywords - format - keyword, tag_list - verify-perf-ndrdisc, NDRDISC - verify-perf-pdrdisc, PDRDISC - verify-perf-mrr, MRR - default tags for vpp startup config and perf test type - 1T1C - one worker thread, one core - 2T2C - two worker threads, two cores + all CSIT MRR perf suites results jjb verify PASS/FAIL @@ -964,71 +953,50 @@ - gerrit-parameter: branch: '{branch}' - 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: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'verify-perf-ndrdisc' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-pdrdisc' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-mrr' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: false - failed: false - unstable: false - notbuilt: false + - timed: '0 2,16 * * *' 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-check.sh + !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-mrr-daily.sh publishers: - archive-artifacts: - artifacts: 'archive/*.*' + artifacts: 'csit/archive/*.*' latest-only: false - robot: - output-path: archive + 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' + name: 'csit-dpdk-perf-mrr-weekly-master' description: | objective - check vpp perf mrr daily + check dpdk perf mrr weekly job name - csit-vpp-perf-mrr-daily + csit-dpdk-perf-mrr-weekly-master trigger - daily + 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 + all CSIT DPDK MRR perf suites results jjb verify PASS/FAIL @@ -1060,14 +1028,14 @@ build-timeout: '{build-timeout}' triggers: - - timed: '0 2,16 * * *' + - 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-mrr-daily.sh + !include-raw-escape: jjb/csit/include-raw-csit-dpdk-perf-mrr-weekly.sh publishers: - archive-artifacts: @@ -1086,7 +1054,6 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - - job-template: name: 'csit-vpp-perf-verify-{stream}' @@ -1099,26 +1066,22 @@ trigger keyword in comment to csit patch perf test-cases selection - test-cases selected using trigger keywords paired with tags + test-cases selected using trigger keyword followed by tags all test-cases are labelled with CSIT RF topic tags defined in csit/docs/tag_documentation.rst proposed keywords focus on testing specified vpp packet processing path - format - keyword - tag_list - perf_verify_ip4 - IP4Base, IP4Scale2M - perf_verify_ip6 - IP6Base, IP6Scale2M - perf_verify_l2 - L2XC, L2BD - perf_verify_lisp - 4Lisp, 6Lisp - perf_verify_vxlan - Vxlan - perf_verify_vhost - Vhost - perf_verify_memif - Memif + format - csit-perftest tag_list default tags for vpp startup config and perf test type + IP4BASE, IP6BASE, L2XCBASE, L2BDBASE + 64B/78B + 64B/78B packet size 1T1C one worker thread, one core - X520 - x520 Niantic NIC - NDRDISC - discovery of NDR throughput + X710 + x710 Fortville NIC + MRR + MDR throughput results jjb verify PASS/FAIL @@ -1157,21 +1120,7 @@ server-name: 'Primary' trigger-on: - comment-added-contains-event: - comment-contains-value: 'verify-perf-l2' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-ip4' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-ip6' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-lisp' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-vxlan' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-vhost' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-memif' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-ipsechw' + comment-contains-value: 'csit-perftest' projects: - project-compare-type: 'ANT' project-pattern: '{project}' @@ -1361,6 +1310,56 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' +- job-template: + name: 'csit-dmm-functional-{stream}-{os}-virl' + + project-type: freestyle + node: '{os}-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}' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-manually-triggered: + name: '{project}' + branch: '{branch}' + comment-trigger-value: 'csit_verify_dmm_func' + + builders: + - shell: + !include-raw-escape: include-raw-csit-dmm-functional-virl.sh + + publishers: + - archive-artifacts: + artifacts: 'report.html, log.html, output.xml' + latest-only: false + + - robot-report: + output-path: '' + + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + - parameter: name: test-type-parameter parameters: