X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit-perf.yaml;h=96fc6a1842d4157d5b57839683d835ecd88a60e4;hb=24a91d832f8edd73f3f3cd7f0e94cdbfa076ca54;hp=45101e7c1ebe961114800878c293c8888fa60cf0;hpb=38d117a3f1c74089aec468cc9097f86d7df4182f;p=ci-management.git diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml index 45101e7c1..96fc6a184 100644 --- a/jjb/csit/csit-perf.yaml +++ b/jjb/csit/csit-perf.yaml @@ -1,5 +1,5 @@ -# Copyright (c) 2019 Cisco and/or its affiliates. -# Copyright (c) 2019 PANTHEON.tech s.r.o. and/or its affiliates. +# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2023 PANTHEON.tech s.r.o. and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -18,67 +18,485 @@ description: 'CSIT Jenkins jobs.' jobs: - - 'csit-vpp-perf-verify-{stream}-{node-arch}' - - 'csit-vpp-perf-mrr-daily-master{node-arch}': + - 'csit-dpdk-perf-verify-{stream}-{node-arch}': node-arch: - - '' - - -2n-clx - - -2n-skx - - -2n-dnv - - -3n-skx - - -3n-dnv - - -3n-tsh: - executor: 'ubuntu1804arm-us' - vpp-mrr-daily-periodicity: '0 14 * * 0' - - 'csit-vpp-perf-mrr-weekly-master-{node-arch}': + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-clx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-zn2: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-tx2: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3n-tsh: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-alt: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-snr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3na-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3nb-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 'csit-dpdk-perf-mrr-weekly-master-{node-arch}': node-arch: - - 2n-clx - - 2n-skx + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-clx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-zn2: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-tx2: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3n-tsh: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-alt: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-snr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3na-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3nb-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '0 0 * * 6' + - 'csit-trex-perf-verify-{stream}-{node-arch}': + node-arch: + - 1n-aws: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 'csit-vpp-perf-verify-{stream}-{node-arch}': + node-arch: + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-clx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-zn2: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-tx2: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3n-tsh: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-alt: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-snr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3na-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3nb-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + stream: + - master: + branch: 'master' + branch-id: 'oper' + - '2310': + branch: 'rls2310' + branch-id: 'oper-rls2310' + - 'csit-vpp-perf-mrr-daily-master-{node-arch}': + node-arch: + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '30 22 * * 0-4' + - 2n-clx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '30 22 * * 0-4' + - 2n-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '30 22 * * 0-4' + - 2n-zn2: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '30 22 * * 0-4' + - 2n-tx2: + os: 'ubuntu2204' + executor-arch: 'aarch64' + periodicity: '30 22 * * 0-4' + - 3n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '30 22 * * 0-4' + - 3n-tsh: + os: 'ubuntu2204' + executor-arch: 'aarch64' + periodicity: '30 22 * * 0-4' + - 3n-alt: + os: 'ubuntu2204' + executor-arch: 'aarch64' + periodicity: '30 22 * * 0-4' + - 3n-snr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '30 22 * * 0-4' + - 3na-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '30 22 * * 0-4' + - 3nb-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '30 22 * * 0-4' + - 'csit-vpp-perf-hoststack-daily-master-{node-arch}': + node-arch: + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '30 22 * * 0-4' + - 2n-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '30 22 * * 0-4' + - 3n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '30 22 * * 0-4' + - 3na-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '30 22 * * 0-4' + - 3nb-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '30 22 * * 0-4' + - 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}': + node-arch: + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-clx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-aws: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-c6in: + os: 'ubuntu2204' + executor-arch: 'x86_64' + stream: + - master: + branch: 'master' + branch-id: 'oper' + periodicity: '0 0 * * 6' + - 'csit-trex-perf-ndrpdr-weekly-master-{node-arch}': + node-arch: + - 1n-aws: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '0 0 * * 6' + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '0 0 * * 6' + - 2n-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '0 0 * * 6' - 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}': node-arch: - - 2n-clx - - 2n-skx - - 3n-skx - - 3n-hsw - - 'csit-dpdk-perf-verify-{stream}-{node-arch}' - - 'csit-dpdk-perf-mrr-weekly-master{node-arch}': + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-clx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-zn2: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-tx2: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3n-tsh: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-alt: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-snr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3na-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3nb-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + periodicity: '0 0 * * 6' + - 'csit-vpp-perf-report-iterative-{stream_report}-{node-arch}': + node-arch: + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-clx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-zn2: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-tx2: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3n-tsh: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-alt: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 2n-aws: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-c6in: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3n-aws: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3n-snr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3na-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3nb-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 'csit-dpdk-perf-report-iterative-{stream_report}-{node-arch}': + node-arch: + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-clx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-zn2: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-tx2: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3n-tsh: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-alt: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 2n-aws: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3n-aws: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3n-snr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3na-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3nb-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 'csit-trex-perf-report-iterative-{stream_report}-{node-arch}': node-arch: - - '' - - -2n-clx - - -2n-skx - - -3n-skx + - 1n-aws: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 'csit-vpp-perf-report-coverage-{stream_report}-{node-arch}': + node-arch: + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-clx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-zn2: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-tx2: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3n-tsh: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-alt: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 2n-aws: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-c6in: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3n-aws: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3n-snr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3na-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3nb-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 'csit-dpdk-perf-report-coverage-{stream_report}-{node-arch}': + node-arch: + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-clx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-zn2: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-tx2: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3n-tsh: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 3n-alt: + os: 'ubuntu2204' + executor-arch: 'aarch64' + - 2n-aws: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-c6in: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3n-aws: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3n-snr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3na-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3nb-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 'csit-trex-perf-report-coverage-{stream_report}-{node-arch}': + node-arch: + - 1n-aws: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 2n-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' project: 'csit' - executor: 'ubuntu1804-us' - ligato-executor: 'ubuntu1804-basebuild-4c-4g' branch: 'master' branch-id: 'oper' - vpp-mrr-daily-periodicity: '0 2,14 * * *' + csit-perf-trial-duration: '1.0' + csit-perf-trial-multiplicity: '10' stream: - master: branch: 'master' branch-id: 'oper' - executor: 'ubuntu1804-us' - - '1904': - branch: 'rls1904' - branch-id: 'oper-rls1904' - executor: 'ubuntu1804-us' - - '1908_1': - branch: 'rls1908_1' - branch-id: 'oper-rls1908_1' - executor: 'ubuntu1804-us' + - '2310': + branch: 'rls2310' + branch-id: 'oper-rls2310' + stream_report: + - '2310': + branch: 'rls2310' + branch-id: 'oper-rls2310' build-artifact-num-to-keep: 10 - node-arch: - - 2n-clx - - 2n-skx - - 2n-dnv - - 3n-skx - - 3n-hsw - - 3n-dnv - - 3n-tsh: - executor: 'ubuntu1804arm-us' - ligato-executor: 'ubuntu1804arm-us' + - job-template: name: 'csit-vpp-perf-verify-{stream}-{node-arch}' @@ -95,10 +513,6 @@
  • trigger: keyword in comment to csit patch: csit-{node-arch}-perftest tag_list -
  • executor -
  • perf test-cases selection project-type: freestyle - node: '{executor}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: true - archive-artifacts: 'archive/*.*' latest-only: false - build-discarder: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" parameters: - project-parameter: @@ -146,10 +557,10 @@ - gerrit-refspec-parameter - gerrit-event-type-parameter - gerrit-event-comment-text-parameter - - string: - name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' - description: Artifacts to archive to the logs server. + - csit-perf-trial-duration-parameter: + csit-perf-trial-duration: "{csit-perf-trial-duration}" + - csit-perf-trial-multiplicity-parameter: + csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}" # This is a manually-triggered verify job, part of API coverage. # CRC checking is needed to ensure vpp crc job breaks only when intended. # Can be removed when this job is no longer needed for full API coverage. @@ -167,38 +578,25 @@ build-timeout: '{build-timeout}' triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'csit-{node-arch}-perftest' - 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 + - gerrit-trigger-csit-perftest: + project: '{project}' + branch: '{branch}' + trigger-word: 'csit-{node-arch}-perftest' + skip-vote: false builders: - shell: - !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh + !include-raw-escape: + - ../scripts/setup_executor_env.sh + - shell: + !include-raw-escape: + - ../scripts/csit/perf-verify.sh publishers: - - robot: - output-path: archive - other-files: - - '*.*' - - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - fdio-infra-publish - job-template: - name: 'csit-vpp-perf-mrr-daily-master{node-arch}' + name: 'csit-vpp-perf-mrr-daily-master-{node-arch}' description: | -
  • executor -
  • perf test-cases selection project-type: freestyle - node: '{executor}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: true - archive-artifacts: 'archive/*.*' latest-only: false - build-discarder: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" parameters: - project-parameter: project: '{project}' - gerrit-parameter: branch: '{branch}' - - string: - name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' - description: Artifacts to archive to the logs server. + - gerrit-refspec-parameter + - gerrit-event-type-parameter + - gerrit-event-comment-text-parameter + - csit-perf-trial-duration-parameter: + csit-perf-trial-duration: "{csit-perf-trial-duration}" + - csit-perf-trial-multiplicity-parameter: + csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}" scm: - gerrit-trigger-scm: @@ -480,38 +1045,25 @@ build-timeout: '{build-timeout}' triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'csit-dpdk-{node-arch}-perftest' - 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 + - gerrit-trigger-csit-perftest: + project: '{project}' + branch: '{branch}' + trigger-word: 'csit-dpdk-{node-arch}-perftest' + skip-vote: false builders: - shell: - !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh + !include-raw-escape: + - ../scripts/setup_executor_env.sh + - shell: + !include-raw-escape: + - ../scripts/csit/perf-verify.sh publishers: - - robot: - output-path: archive - other-files: - - '*.*' - - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - fdio-infra-publish - job-template: - name: 'csit-dpdk-perf-mrr-weekly-master{node-arch}' + name: 'csit-dpdk-perf-mrr-weekly-master-{node-arch}' description: |