X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=58a64154aaf2ab1b4ec195531d6fe64c2f7fd8af;hb=c320744b40ec9f2243fc8aa7fd1528064d6c4ace;hp=880fcb2154c7959a57e5197db25f630d742204e4;hpb=b41db525b39f0d7d31f3381f589bae0f7bcb0478;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 880fcb215..58a64154a 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2023 Cisco 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: @@ -33,18 +33,31 @@ jobs: - 'vpp-checkstyle-verify-{stream}-{os}-{executor-arch}' project: 'vpp' - os: 'ubuntu2004' + os: + - ubuntu2004 + - ubuntu2204 stream: - - master: + - 'master': branch: 'master' branch-refspec: '' - - '2106': - branch: 'stable/2106' + - '2210': + branch: 'stable/2210' branch-refspec: '' - - '2110': - branch: 'stable/2110' + - '2302': + branch: 'stable/2302' 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 # VPP-X86_64 PROJECT @@ -63,32 +76,27 @@ - 'vpp-merge-{stream}-{os}-{executor-arch}' project: 'vpp' make-parallel-jobs: '4' - make-test-os: 'ubuntu-20.04' stream: - - master: + - 'master': branch: 'master' branch-refspec: '' - - '2106': - branch: 'stable/2106' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' + make-test-multiworker-os: 'debian-11' + - '2210': + branch: 'stable/2210' branch-refspec: '' - - '2110': - branch: 'stable/2110' + make-test-os: 'ubuntu-20.04' + make-test-multiworker-os: 'debian-11' + - '2302': + branch: 'stable/2302' branch-refspec: '' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' + make-test-multiworker-os: 'debian-11' os: - - centos8 - - debian10 - - ubuntu1804 + - debian11 - ubuntu2004 + - ubuntu2204 executor-arch: 'x86_64' - exclude: - # OS deprecated in master - - stream: 'master' - os: 'centos8' - - stream: 'master' - os: 'ubuntu1804' - # OS deprecated on 2110 - - stream: '2110' - os: 'centos8' # [end] VPP-X86_64 PROJECT # VPP-DEBUG-X86_64 PROJECT @@ -103,36 +111,72 @@ - 'vpp-debug-verify-{stream}-{os}-{executor-arch}' project: 'vpp' make-parallel-jobs: '4' - make-test-os: 'ubuntu-20.04' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' comment-trigger-value: 'debug-verify' stream: - - master: + - 'master': branch: 'master' branch-refspec: '' - # Once per hour - periodicity: 'H * * * *' - os: 'ubuntu2004' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' + os: 'ubuntu2204' executor-arch: 'x86_64' + # [end] VPP-DEBUG-X86_64 PROJECT +# VPP-DPDK-RDMA-VERSION-MISMATCH-X86_64 PROJECT +# +# Currently a periodic job due to intermittent failures. +# Limiting branches to master, since other branches +# may not get fixes for the intermittent failures. +# +- project: + name: vpp-dpdk-rdma-version-mismatch-x86_64 + jobs: + - 'vpp-dpdk-rdma-version-mismatch-{stream}-{os}-{executor-arch}' + project: 'vpp' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' + comment-trigger-value: 'dpdk-rdma-version-mismatch' + stream: + - 'master': + branch: 'master' + # Once per day at 00:15 + periodicity: '15 0 * * 0-6' + os: 'ubuntu2204' + executor-arch: 'x86_64' + +# [end] VPP-DPDK-RDMA-VERSION-MISMATCH-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: + - ubuntu2004 + - ubuntu2204 executor-arch: 'x86_64' - os: 'ubuntu2004' stream: - - master: + - 'master': branch: 'master' branch-refspec: '' - - '2106': - branch: 'stable/2106' + - '2210': + branch: 'stable/2210' branch-refspec: '' - - '2110': - branch: 'stable/2110' + - '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 # VPP-AARCH64 PROJECT @@ -150,71 +194,52 @@ - 'vpp-verify-{stream}-{os}-{executor-arch}' - 'vpp-merge-{stream}-{os}-{executor-arch}' project: 'vpp' - make-parallel-jobs: '16' - make-test-os: 'ubuntu-20.04' + make-parallel-jobs: '4' stream: - - master: + - 'master': branch: 'master' branch-refspec: '' - - '2106': - branch: 'stable/2106' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' + make-test-multiworker-os: '' + - '2210': + branch: 'stable/2210' branch-refspec: '' - - '2110': - branch: 'stable/2110' + make-test-os: 'ubuntu-20.04' + make-test-multiworker-os: '' + - '2302': + branch: 'stable/2302' branch-refspec: '' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' + make-test-multiworker-os: '' os: - - centos8 - - ubuntu1804 - ubuntu2004 + - ubuntu2204 executor-arch: 'aarch64' - exclude: - # OS deprecated in master - - stream: 'master' - os: 'centos8' - - stream: 'master' - os: 'ubuntu1804' - # OS deprecated in 2110 - - stream: '2110' - os: 'centos8' # [end] VPP-AARCH64 PROJECT # VPP-CSIT-VERIFY-DEVICE PROJECT - project: name: vpp-csit-verify-device jobs: - - 'vpp-csit-verify-device-perpatch': - make-parallel-jobs: '32' - exclude: - - testbed-arch: '1n-tx2' - - 'vpp-csit-verify-device-periodic': + - 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}': make-parallel-jobs: '32' - periodicity: 'H * * * *' - skip-vote: 'true' - comment-trigger-value: 'devicetest-periodic' - exclude: - - stream: '2106' - - stream: '2110' - - testbed-arch: '1n-skx' project: 'vpp' skip-vote: 'false' stream: - - master: + - 'master': branch: 'master' branch-refspec: '' - - '2106': - branch: 'stable/2106' - branch-refspec: '' - - '2110': - branch: 'stable/2110' + - '2302': + branch: 'stable/2302' branch-refspec: '' testbed-arch: - 1n-skx: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' - 1n-tx2: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'aarch64' - + skip-vote: 'false' # [end] VPP-CSIT-VERIFY-DEVICE PROJECT # VPP-CSIT-VERIFY-PERF PROJECT @@ -225,43 +250,40 @@ project: 'vpp' skip-vote: 'false' stream: - - master: + - 'master': branch: 'master' branch-refspec: '' - - '2106': - branch: 'stable/2106' - branch-refspec: '' - - '2110': - branch: 'stable/2110' - branch-refspec: '' testbed-arch: + - 2n-icx: + os: 'ubuntu2204' + executor-arch: 'x86_64' - 2n-clx: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-skx: - os: 'ubuntu2004' + - 2n-spr: + os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: - os: 'ubuntu2004' - executor-arch: 'x86_64' - - 3n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - - 2n-dnv: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-dnv: - os: 'ubuntu2004' + - 3n-icx: + os: 'ubuntu2204' executor-arch: 'x86_64' - 3n-tsh: - os: 'ubuntu2004' + os: 'ubuntu2204' + executor-arch: 'aarch64' + make-parallel-jobs: '16' + - 3n-alt: + os: 'ubuntu2204' executor-arch: 'aarch64' make-parallel-jobs: '16' - 2n-tx2: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'aarch64' make-parallel-jobs: '16' - + - 3n-snr: + os: 'ubuntu2204' + executor-arch: 'x86_64' # [end] VPP-CSIT-VERIFY-PERF PROJECT # VPP-CSIT-API-CRC PROJECT @@ -276,16 +298,14 @@ executor-arch: 'x86_64' skip-vote: 'false' stream: - - master: + - 'master': branch: 'master' branch-refspec: '' - - '2106': - branch: 'stable/2106' + - '2302': + branch: 'stable/2302' branch-refspec: '' - - '2110': - branch: 'stable/2110' - branch-refspec: '' - os: 'ubuntu2004' + os: + - 'ubuntu2204' # [end] VPP-CSIT-API-CRC PROJECT # LF RELENG VPP PROJECTS @@ -359,8 +379,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: @@ -381,8 +399,6 @@ - compare-type: REG_EXP pattern: ^((?!\/COMMIT_MSG|docs|_abc|_def[\/\.]).)*$ forbidden-file-paths: - - compare-type: REG_EXP - pattern: .*docs\/.* - compare-type: REG_EXP pattern: .*extras\/emacs\/.* disable-strict-forbidden-file-verification: 'true' @@ -416,6 +432,9 @@ - shell: !include-raw-escape: - ../scripts/vpp/commitmsg.sh + - shell: + !include-raw-escape: + - ../scripts/vpp/docs_spell.sh publishers: - fdio-infra-publish @@ -444,6 +463,8 @@ make-parallel-jobs: '{make-parallel-jobs}' - make-test-os-parameter: make-test-os: '{make-test-os}' + - make-test-multiworker-os-parameter: + make-test-multiworker-os: '{make-test-multiworker-os}' - os-parameter: os: '{os}' - project-parameter: @@ -475,7 +496,7 @@ - ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: !include-raw-escape: - - ../scripts/setup_vpp_dpdk_dev_env.sh + - ../scripts/setup_vpp_ext_deps.sh - shell: !include-raw-escape: - ../scripts/vpp/build.sh @@ -524,9 +545,7 @@ build-timeout: '{build-timeout}' triggers: - - timed: '{periodicity}' - - gerrit-trigger-manually-triggered: - comment-trigger-value: '{comment-trigger-value}' + - gerrit-trigger-checkstyle-nonvoting: name: '{project}' branch: '{branch}' @@ -539,7 +558,7 @@ - ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: !include-raw-escape: - - ../scripts/setup_vpp_dpdk_dev_env.sh + - ../scripts/setup_vpp_ext_deps.sh - shell: !include-raw-escape: - ../scripts/vpp/debug-build.sh @@ -548,12 +567,13 @@ - fdio-infra-publish # [end] VPP-DEBUG-VERIFY-PERIODIC JOB TEMPLATE -# VPP-MERGE JOB TEMPLATE +# VPP-DPDK-RDMA-VERSION-MISMATCH PERIODIC JOB TEMPLATE - job-template: - name: 'vpp-merge-{stream}-{os}-{executor-arch}' + name: 'vpp-dpdk-rdma-version-mismatch-{stream}-{os}-{executor-arch}' project-type: freestyle node: 'builder-{os}-prod-{executor-arch}' + concurrent: true properties: - lf-infra-properties: @@ -582,22 +602,16 @@ wrappers: - fdio-infra-wrappers: - build-timeout: 120 + build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-merged: + - timed: '{periodicity}' + - gerrit-trigger-manually-triggered: + comment-trigger-value: '{comment-trigger-value}' name: '{project}' branch: '{branch}' builders: - - config-file-provider: - files: - - file-id: '.packagecloud' - target: '/root/.packagecloud' - - config-file-provider: - files: - - file-id: 'packagecloud_api' - target: '/root/packagecloud_api' - shell: !include-raw-escape: - ../scripts/setup_executor_env.sh @@ -606,25 +620,20 @@ - ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: !include-raw-escape: - - ../scripts/setup_vpp_dpdk_dev_env.sh - - shell: - !include-raw-escape: - - ../scripts/vpp/build.sh - - shell: - !include-raw-escape: - - ../scripts/packagecloud_push.sh + - ../scripts/vpp/dpdk-rdma-version-mismatch.sh publishers: + - vpp-dpdk-rdma-version-mismatch: + branch: '{branch}' - fdio-infra-publish -# [end] VPP-MERGE JOB TEMPLATE +# [end] VPP-DPDK-RDMA-VERSION-MISMATCH PERIODIC JOB TEMPLATE -# VPP-GCC-VERIFY JOB TEMPLATE +# VPP-MERGE JOB TEMPLATE - job-template: - name: 'vpp-gcc-verify-{stream}-{os}-{executor-arch}' + name: 'vpp-merge-{stream}-{os}-{executor-arch}' project-type: freestyle node: 'builder-{os}-prod-{executor-arch}' - concurrent: true properties: - lf-infra-properties: @@ -634,10 +643,12 @@ parameters: - gerrit-parameter: branch: '{branch}' - - gerrit-refspec-parameter: - refspec: '{branch-refspec}' - make-parallel-jobs-parameter: make-parallel-jobs: '{make-parallel-jobs}' + - make-test-os-parameter: + make-test-os: '{make-test-os}' + - make-test-multiworker-os-parameter: + make-test-multiworker-os: '{make-test-multiworker-os}' - os-parameter: os: '{os}' - project-parameter: @@ -648,56 +659,57 @@ scm: - gerrit-trigger-scm: credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + refspec: '' + choosing-strategy: 'default' wrappers: - fdio-infra-wrappers: build-timeout: 120 triggers: - - gerrit-trigger-checkstyle: + - gerrit-trigger-patch-merged: name: '{project}' branch: '{branch}' builders: + - config-file-provider: + files: + - file-id: '.packagecloud' + target: '/root/.packagecloud' + - config-file-provider: + files: + - file-id: 'packagecloud_api' + target: '/root/packagecloud_api' - 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 - shell: !include-raw-escape: - - ../scripts/setup_vpp_dpdk_dev_env.sh + - ../scripts/setup_vpp_ext_deps.sh - shell: !include-raw-escape: - - ../scripts/vpp/gcc-build.sh + - ../scripts/vpp/build.sh + - shell: + !include-raw-escape: + - ../scripts/packagecloud_push.sh publishers: - fdio-infra-publish -# [end] VPP-GCC-VERIFY JOB TEMPLATE +# [end] VPP-MERGE JOB TEMPLATE -# VPP-CSIT-VERIFY-DEVICE-PERIODIC JOB TEMPLATE +# VPP-GCC-VERIFY JOB TEMPLATE - job-template: - name: 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}' - id: 'vpp-csit-verify-device-periodic' - description: | - + name: 'vpp-gcc-verify-{stream}-{os}-{executor-arch}' project-type: freestyle - node: 'csit-builder-{os}-prod-{executor-arch}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: true - latest-only: false properties: - lf-infra-properties: @@ -705,9 +717,6 @@ # Please keep parameters in alphabetical order parameters: - - gerrit-csit-refspec-parameter - - gerrit-event-comment-text-parameter - - gerrit-event-type-parameter - gerrit-parameter: branch: '{branch}' - gerrit-refspec-parameter: @@ -725,16 +734,14 @@ - gerrit-trigger-scm: credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'default' + choosing-strategy: 'gerrit' wrappers: - fdio-infra-wrappers: - build-timeout: '90' + build-timeout: 120 triggers: - - timed: '{periodicity}' - - gerrit-trigger-manually-triggered: - comment-trigger-value: '{comment-trigger-value}' + - gerrit-trigger-checkstyle: name: '{project}' branch: '{branch}' @@ -747,19 +754,18 @@ - ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: !include-raw-escape: - - ../scripts/setup_vpp_dpdk_dev_env.sh + - ../scripts/setup_vpp_ext_deps.sh - shell: !include-raw-escape: - - ../scripts/vpp/csit-device.sh + - ../scripts/vpp/gcc-build.sh publishers: - fdio-infra-publish -# [end] VPP-CSIT-VERIFY-DEVICE-PERIODIC JOB TEMPLATE +# [end] VPP-GCC-VERIFY JOB TEMPLATE # VPP-CSIT-VERIFY-DEVICE-PERPATCH JOB TEMPLATE - job-template: name: 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}' - id: 'vpp-csit-verify-device-perpatch' description: |