X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=4422988e40ffdf0adbf1a551dacf630a135b283a;hb=7b7ffa99873e679b637ef00a3953ddd1f5a28aae;hp=ade6162351516aa7727d1fcc1cd79cc161c59c82;hpb=3b3a283b12d41c53ed941df0a9e7f69b5562c8a4;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index ade616235..4422988e4 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -34,29 +34,18 @@ - 'vpp-checkstyle-verify-{stream}-{os}-{executor-arch}' project: 'vpp' os: - - ubuntu2004 - ubuntu2204 stream: - 'master': branch: 'master' branch-refspec: '' - - '2210': - branch: 'stable/2210' + - '2310': + branch: 'stable/2310' branch-refspec: '' - - '2302': - branch: 'stable/2302' + - '2402': + branch: 'stable/2402' branch-refspec: '' executor-arch: 'x86_64' - exclude: - # os deprecated in 23.02 - - stream: '2302' - os: 'ubuntu2004' - # os deprecated in 22.10 - - stream: '2210' - os: 'ubuntu2004' - # os deprecated in master - - stream: 'master' - os: 'ubuntu2004' # [end] VPP-CHECKSTYLE-X86_64 PROJECT @@ -82,13 +71,13 @@ branch-refspec: '' make-test-os: 'ubuntu-20.04 ubuntu-22.04' make-test-multiworker-os: 'debian-11' - - '2210': - branch: 'stable/2210' + - '2310': + branch: 'stable/2310' branch-refspec: '' - make-test-os: 'ubuntu-20.04' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' make-test-multiworker-os: 'debian-11' - - '2302': - branch: 'stable/2302' + - '2402': + branch: 'stable/2402' branch-refspec: '' make-test-os: 'ubuntu-20.04 ubuntu-22.04' make-test-multiworker-os: 'debian-11' @@ -99,6 +88,29 @@ executor-arch: 'x86_64' # [end] VPP-X86_64 PROJECT +# VPP-GCC-X86_64 PROJECT +- project: + name: vpp-gcc-x86_64 + jobs: + - 'vpp-gcc-verify-{stream}-{os}-{executor-arch}' + project: 'vpp' + make-parallel-jobs: '4' + os: + - ubuntu2204 + executor-arch: 'x86_64' + stream: + - 'master': + branch: 'master' + branch-refspec: '' + - '2310': + branch: 'stable/2310' + branch-refspec: '' + - '2402': + branch: 'stable/2402' + branch-refspec: '' + +# [end] VPP-GCC-X86_64 PROJECT + # VPP-DEBUG-X86_64 PROJECT # # Currently a periodic job due to intermittent failures. @@ -146,38 +158,31 @@ # [end] VPP-DPDK-RDMA-VERSION-MISMATCH-X86_64 PROJECT -# VPP-GCC-X86_64 PROJECT +# VPP-COV-X86_64 PROJECT +# +# A per-patch job to produce code coverage. +# +# TODO: switch OS to ubuntu-22.04 once the skipping of intermittently failing +# tests are removed +# - project: - name: vpp-gcc-x86_64 + name: vpp-cov-x86_64 jobs: - - 'vpp-gcc-verify-{stream}-{os}-{executor-arch}' + - 'vpp-cov-verify-{stream}-{os}-{executor-arch}' project: 'vpp' make-parallel-jobs: '4' - os: - - ubuntu2004 - - ubuntu2204 - executor-arch: 'x86_64' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' + comment-trigger-value: 'gcov-report' stream: - 'master': branch: 'master' branch-refspec: '' - - '2210': - branch: 'stable/2210' - branch-refspec: '' - - '2302': - branch: 'stable/2302' - branch-refspec: '' - exclude: - # os deprecated in 23.02 - - stream: '2302' - os: 'ubuntu2004' - # os deprecated in 22.10 - - stream: '2210' - os: 'ubuntu2004' - # os deprecated in master - - stream: 'master' - os: 'ubuntu2004' -# [end] VPP-GCC-X86_64 PROJECT + # Once per day at 00:25 + periodicity: '25 0 * * 0-6' + os: 'ubuntu2004' + executor-arch: 'x86_64' + +# [end] VPP-COV-X86_64 PROJECT # VPP-AARCH64 PROJECT # @@ -201,13 +206,13 @@ branch-refspec: '' make-test-os: 'ubuntu-20.04 ubuntu-22.04' make-test-multiworker-os: '' - - '2210': - branch: 'stable/2210' + - '2310': + branch: 'stable/2310' branch-refspec: '' - make-test-os: 'ubuntu-20.04' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' make-test-multiworker-os: '' - - '2302': - branch: 'stable/2302' + - '2402': + branch: 'stable/2402' branch-refspec: '' make-test-os: 'ubuntu-20.04 ubuntu-22.04' make-test-multiworker-os: '' @@ -229,20 +234,30 @@ - 'master': branch: 'master' branch-refspec: '' - - '2210': - branch: 'stable/2210' + - '2310': + branch: 'stable/2310' branch-refspec: '' - - '2302': - branch: 'stable/2302' + - '2402': + branch: 'stable/2402' branch-refspec: '' testbed-arch: - - 1n-skx: + - 1n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - - 1n-tx2: + skip-vote: 'true' +# - 1n-tx2: +# os: 'ubuntu2204' +# executor-arch: 'aarch64' +# skip-vote: 'false' + - 1n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' - skip-vote: 'false' + skip-vote: 'true' + exclude: + # 1n-alt testbed not supported + # in CSIT prior to 2402 + - testbed-arch: 1n-alt + stream: '2310' # [end] VPP-CSIT-VERIFY-DEVICE PROJECT # VPP-CSIT-VERIFY-PERF PROJECT @@ -250,6 +265,7 @@ name: vpp-csit-verify-perf jobs: - 'vpp-csit-verify-perf-{stream}-{os}-{executor-arch}-{testbed-arch}' + - 'vpp-csit-bisect-{stream}-{os}-{executor-arch}-{testbed-arch}' project: 'vpp' skip-vote: 'false' stream: @@ -263,6 +279,9 @@ - 2n-clx: os: 'ubuntu2204' executor-arch: 'x86_64' + - 2n-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' @@ -284,6 +303,15 @@ - 3n-snr: os: 'ubuntu2204' executor-arch: 'x86_64' + - 3n-icxd: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3na-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' + - 3nb-spr: + os: 'ubuntu2204' + executor-arch: 'x86_64' # [end] VPP-CSIT-VERIFY-PERF PROJECT # VPP-CSIT-API-CRC PROJECT @@ -301,11 +329,11 @@ - 'master': branch: 'master' branch-refspec: '' - - '2210': - branch: 'stable/2210' + - '2310': + branch: 'stable/2310' branch-refspec: '' - - '2302': - branch: 'stable/2302' + - '2402': + branch: 'stable/2402' branch-refspec: '' os: - 'ubuntu2204' @@ -382,8 +410,6 @@ - draft-published-event - comment-added-contains-event: comment-contains-value: 'checkstylecheck' - - comment-added-contains-event: - comment-contains-value: 'docsonly' - comment-added-contains-event: comment-contains-value: 'recheck' - comment-added-contains-event: @@ -570,7 +596,7 @@ publishers: - fdio-infra-publish -# [end] VPP-DEBUG-VERIFY-PERIODIC JOB TEMPLATE +# [end] VPP-DEBUG-VERIFY JOB TEMPLATE # VPP-DPDK-RDMA-VERSION-MISMATCH PERIODIC JOB TEMPLATE - job-template: @@ -688,6 +714,9 @@ - shell: !include-raw-escape: - ../scripts/setup_executor_env.sh + - shell: + !include-raw-escape: + - ../scripts/vpp/commitmsg.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh @@ -765,6 +794,69 @@ - fdio-infra-publish # [end] VPP-GCC-VERIFY JOB TEMPLATE +# VPP-COV-VERIFY JOB TEMPLATE +- job-template: + name: 'vpp-cov-verify-{stream}-{os}-{executor-arch}' + + project-type: freestyle + node: 'builder-{os}-prod-{executor-arch}' + concurrent: true + + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" + + # Please keep parameters in alphabetical order + parameters: + - gerrit-parameter: + branch: '{branch}' + - make-parallel-jobs-parameter: + make-parallel-jobs: '{make-parallel-jobs}' + - make-test-os-parameter: + make-test-os: '{make-test-os}' + - os-parameter: + os: '{os}' + - project-parameter: + project: '{project}' + - stream-parameter: + stream: '{stream}' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '' + choosing-strategy: 'default' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - timed: '{periodicity}' + - gerrit-trigger-manually-triggered: + comment-trigger-value: '{comment-trigger-value}' + name: '{project}' + branch: '{branch}' + + builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh + - shell: + !include-raw-escape: + - ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: + !include-raw-escape: + - ../scripts/setup_vpp_ext_deps.sh + - shell: + !include-raw-escape: + - ../scripts/vpp/cov-build.sh + + publishers: + - fdio-infra-publish-cov-7day + - fdio-infra-publish +# [end] VPP-COV-VERIFY JOB TEMPLATE + # VPP-CSIT-VERIFY-DEVICE-PERPATCH JOB TEMPLATE - job-template: name: 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}' @@ -936,12 +1028,107 @@ - shell: !include-raw-escape: - ../scripts/vpp/copy_archives.sh - - robot-report: - output-path: 'archives/csit_current/0/' - - fdio-infra-publish # [end] VPP-CSIT-VERIFY-PERF JOB TEMPLATE +# VPP-CSIT-BISECT JOB TEMPLATE +- job-template: + name: 'vpp-csit-bisect-{stream}-{os}-{executor-arch}-{testbed-arch}' + description: | + + + project-type: freestyle + node: 'builder-{os}-prod-{executor-arch}' + concurrent: true + latest-only: false + + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" + + # Please keep parameters in alphabetical order + parameters: + - csit-perf-trial-duration-parameter: + csit-perf-trial-duration: "1.0" + - csit-perf-trial-multiplicity-parameter: + csit-perf-trial-multiplicity: "60" + - gerrit-csit-refspec-parameter + - gerrit-event-comment-text-parameter + - gerrit-event-type-parameter + - gerrit-refspec-parameter: + refspec: '{branch-refspec}' + - gerrit-parameter: + branch: '{branch}' + - make-parallel-jobs-parameter: + make-parallel-jobs: '{make-parallel-jobs}' + - os-parameter: + os: '{os}' + - project-parameter: + project: '{project}' + - stream-parameter: + stream: '{stream}' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: 300 + + triggers: + - gerrit-trigger-csit-perftest: + project: '{project}' + branch: '{branch}' + trigger-word: 'bisecttest-{testbed-arch}' + skip-vote: true + + builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh + - shell: + !include-raw-escape: + - ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: + !include-raw-escape: + - ../scripts/setup_vpp_ext_deps.sh + - shell: + !include-raw-escape: + - ../scripts/vpp/csit-bisect.sh + + publishers: + - postbuildscript: + # Can be removed when all CSIT branches use correct archive directory. + builders: + - build-on: + - ABORTED + - FAILURE + - NOT_BUILT + - SUCCESS + - UNSTABLE + build-steps: + - shell: + !include-raw-escape: + - ../scripts/vpp/copy_archives.sh + - fdio-infra-publish +# [end] VPP-CSIT-BISECT JOB TEMPLATE + # VPP-CSIT-VERIFY-API-CRC JOB TEMPLATE - job-template: name: 'vpp-csit-verify-api-crc-{stream}-{os}-{executor-arch}' @@ -1002,3 +1189,22 @@ - fdio-infra-publish # [end] VPP-CSIT-VERIFY-API-CRC JOB TEMPLATE # [end] JOB TEMPLATE DEFINITIONS + +- project: + name: vpp-release + project: vpp + project-name: vpp + build-node: centos8-builder-2c-2g + mvn-settings: vpp-settings + jobs: + - "gerrit-packagecloud-release-verify" + +- project: + name: vpp-packagecloud-release + project: vpp + project-name: vpp + build-node: centos8-builder-2c-2g + mvn-settings: vpp-settings + jobs: + - "gerrit-packagecloud-release-merge" + - "{project-name}-gerrit-release-jobs"