X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=bad647f691861451b724d635a19f1014db19645d;hb=88daabbeea422de78927301b41c5a97fd0d6dab0;hp=2f015d4b83eaa6d9e06de759104015bb38710d85;hpb=0c448376cb587f209b359a20208cb2255db93a8f;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 2f015d4b8..bad647f69 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) 2022 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,23 +33,17 @@ jobs: - 'vpp-checkstyle-verify-{stream}-{os}-{executor-arch}' project: 'vpp' + os: 'ubuntu2004' stream: - master: branch: 'master' branch-refspec: '' - os: 'ubuntu2004' - repo-stream-part: 'master' - - '2009': - branch: 'stable/2009' + - '2202': + branch: 'stable/2202' branch-refspec: '' - os: 'ubuntu1804' - repo-stream-part: 'stable.2009' - os: 'ubuntu1804' - - '2101': - branch: 'stable/2101' + - '2206': + branch: 'stable/2206' branch-refspec: '' - os: 'ubuntu1804' - repo-stream-part: 'stable.2101' executor-arch: 'x86_64' # [end] VPP-CHECKSTYLE-X86_64 PROJECT @@ -70,54 +64,31 @@ project: 'vpp' make-parallel-jobs: '4' make-test-os: 'ubuntu-20.04' - archive-artifacts: '/tmp/vpp-failed-unittests/*/*' stream: - master: branch: 'master' branch-refspec: '' - repo-stream-part: 'master' - - '2009': - branch: 'stable/2009' + - '2202': + branch: 'stable/2202' branch-refspec: '' - make-test-os: 'ubuntu-18.04' - repo-stream-part: 'stable.2009' - - '2101': - branch: 'stable/2101' + - '2206': + branch: 'stable/2206' branch-refspec: '' - make-test-os: 'ubuntu-18.04' - repo-stream-part: 'stable.2101' os: - - centos7: - repo-os-part: 'centos7' - - centos8: - repo-os-part: 'centos8' - - debian9: - repo-os-part: 'stretch' - - debian10: - repo-os-part: 'buster' - - ubuntu1804: - repo-os-part: 'ubuntu.bionic.main' - - ubuntu2004: - repo-os-part: 'ubuntu.focal.main' + - debian10 + - debian11 + - ubuntu2004 executor-arch: 'x86_64' exclude: - # OS deprecated in master - - stream: 'master' - os: 'centos7' - - stream: 'master' - os: 'debian9' - # 2009 LTS supports all OS variants - # OS deprecated in 2101 - - stream: '2101' - os: 'centos7' - - stream: '2101' - os: 'debian9' + # os added in 22.06 + - stream: '2202' + os: 'debian11' # [end] VPP-X86_64 PROJECT # VPP-DEBUG-X86_64 PROJECT # # Currently a periodic job due to intermittent failures. -# Limiting branches to master and 2009, since other branches +# Limiting branches to master, since other branches # may not get fixes for the intermittent failures. # - project: @@ -127,7 +98,6 @@ project: 'vpp' make-parallel-jobs: '4' make-test-os: 'ubuntu-20.04' - archive-artifacts: '/tmp/vpp-failed-unittests/*/*' comment-trigger-value: 'debug-verify' stream: - master: @@ -135,17 +105,7 @@ branch-refspec: '' # Once per hour periodicity: 'H * * * *' - repo-stream-part: 'master' - - '2009': - branch: 'stable/2009' - branch-refspec: '' - make-test-os: 'ubuntu-18.04' - # Once per day - periodicity: 'H H * * *' - repo-stream-part: 'stable.2009' - os: - - ubuntu2004: - repo-os-part: 'ubuntu.focal.main' + os: 'ubuntu2004' executor-arch: 'x86_64' # [end] VPP-DEBUG-X86_64 PROJECT @@ -156,22 +116,17 @@ - 'vpp-gcc-verify-{stream}-{os}-{executor-arch}' project: 'vpp' executor-arch: 'x86_64' - os: - - ubuntu2004: - repo-os-part: 'ubuntu.focal.main' + os: 'ubuntu2004' stream: - master: branch: 'master' branch-refspec: '' - repo-stream-part: 'master' - - '2009': - branch: 'stable/2009' + - '2202': + branch: 'stable/2202' branch-refspec: '' - repo-stream-part: 'stable.2009' - - '2101': - branch: 'stable/2101' + - '2206': + branch: 'stable/2206' branch-refspec: '' - repo-stream-part: 'stable.2101' # [end] VPP-GCC-X86_64 PROJECT # VPP-AARCH64 PROJECT @@ -191,75 +146,39 @@ project: 'vpp' make-parallel-jobs: '16' make-test-os: 'ubuntu-20.04' - archive-artifacts: '/tmp/vpp-failed-unittests/*/*' stream: - master: branch: 'master' branch-refspec: '' - repo-stream-part: 'master' - - '2009': - branch: 'stable/2009' + - '2202': + branch: 'stable/2202' branch-refspec: '' - make-test-os: 'ubuntu-18.04' - repo-stream-part: 'stable.2009' - - '2101': - branch: 'stable/2101' + - '2206': + branch: 'stable/2206' branch-refspec: '' - make-test-os: 'ubuntu-18.04' - repo-stream-part: 'stable.2101' os: - - centos8: - repo-os-part: 'centos8' - - ubuntu1804: - repo-os-part: 'ubuntu-arm.bionic.main' - - ubuntu2004: - repo-os-part: 'ubuntu.focal.main' + - ubuntu2004 executor-arch: 'aarch64' - exclude: - # OS introduced after 2009 - - stream: '2009' - os: 'centos8' - - stream: '2009' - os: 'ubuntu2004' - # OS introduced after 2101 - - stream: '2101' - os: 'centos8' - - stream: '2101' - os: 'ubuntu2004' # [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: '2009' - - stream: '2101' - - testbed-arch: '1n-skx' project: 'vpp' skip-vote: 'false' stream: - master: branch: 'master' branch-refspec: '' - repo-stream-part: 'master' - - '2009': - branch: 'stable/2009' + - '2202': + branch: 'stable/2202' branch-refspec: '' - repo-stream-part: 'stable.2009' - - '2101': - branch: 'stable/2101' + - '2206': + branch: 'stable/2206' branch-refspec: '' - repo-stream-part: 'stable.2101' testbed-arch: - 1n-skx: os: 'ubuntu2004' @@ -267,6 +186,7 @@ - 1n-tx2: os: 'ubuntu2004' executor-arch: 'aarch64' + skip-vote: 'true' # [end] VPP-CSIT-VERIFY-DEVICE PROJECT @@ -281,16 +201,16 @@ - master: branch: 'master' branch-refspec: '' - repo-stream-part: 'master' - - '2009': - branch: 'stable/2009' + - '2202': + branch: 'stable/2202' branch-refspec: '' - repo-stream-part: 'stable.2009' - - '2101': - branch: 'stable/2101' + - '2206': + branch: 'stable/2206' branch-refspec: '' - repo-stream-part: 'stable.2101' testbed-arch: + - 2n-icx: + os: 'ubuntu2004' + executor-arch: 'x86_64' - 2n-clx: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -303,7 +223,7 @@ - 3n-skx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 3n-hsw: + - 3n-icx: os: 'ubuntu2004' executor-arch: 'x86_64' - 2n-dnv: @@ -316,10 +236,17 @@ os: 'ubuntu2004' executor-arch: 'aarch64' make-parallel-jobs: '16' + - 3n-alt: + os: 'ubuntu2004' + executor-arch: 'aarch64' + make-parallel-jobs: '16' - 2n-tx2: os: 'ubuntu2004' executor-arch: 'aarch64' make-parallel-jobs: '16' + - 3n-snr: + os: 'ubuntu2004' + executor-arch: 'x86_64' # [end] VPP-CSIT-VERIFY-PERF PROJECT @@ -338,15 +265,13 @@ - master: branch: 'master' branch-refspec: '' - - '2009': - branch: 'stable/2009' + - '2202': + branch: 'stable/2202' branch-refspec: '' - repo-stream-part: 'stable.2009' - - '2101': - branch: 'stable/2101' + - '2206': + branch: 'stable/2206' branch-refspec: '' - repo-stream-part: 'stable.2101' - os: ubuntu2004 + os: 'ubuntu2004' # [end] VPP-CSIT-API-CRC PROJECT # LF RELENG VPP PROJECTS @@ -380,11 +305,9 @@ node: 'builder-{os}-prod-{executor-arch}' concurrent: true - 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}" # Please keep parameters in alphabetical order parameters: @@ -396,10 +319,6 @@ os: '{os}' - project-parameter: project: '{project}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.ubuntu.bionic.main' - - workspace-archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -448,8 +367,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' @@ -483,6 +400,9 @@ - shell: !include-raw-escape: - ../scripts/vpp/commitmsg.sh + - shell: + !include-raw-escape: + - ../scripts/vpp/docs_spell.sh publishers: - fdio-infra-publish @@ -497,11 +417,9 @@ node: 'builder-{os}-prod-{executor-arch}' concurrent: true - build-discarder: - daysToKeep: '{build-days-to-keep}' - numToKeep: 100 - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" # Please keep parameters in alphabetical order parameters: @@ -517,12 +435,8 @@ os: '{os}' - project-parameter: project: '{project}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' - - workspace-archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -548,7 +462,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 @@ -565,11 +479,9 @@ node: 'builder-{os}-prod-{executor-arch}' concurrent: true - 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}" # Please keep parameters in alphabetical order parameters: @@ -582,15 +494,11 @@ - make-test-os-parameter: make-test-os: '{make-test-os}' - os-parameter: - os: 'ubuntu1804' + os: '{os}' - project-parameter: project: '{project}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.ubuntu.bionic.main' - stream-parameter: stream: '{stream}' - - workspace-archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -618,7 +526,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 @@ -634,11 +542,9 @@ project-type: freestyle node: 'builder-{os}-prod-{executor-arch}' - build-discarder: - daysToKeep: '{build-days-to-keep}' - numToKeep: 100 - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" # Please keep parameters in alphabetical order parameters: @@ -652,12 +558,8 @@ os: '{os}' - project-parameter: project: '{project}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' - - workspace-archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -678,11 +580,11 @@ - config-file-provider: files: - file-id: '.packagecloud' - target: '/root' + target: '/root/.packagecloud' - config-file-provider: files: - file-id: 'packagecloud_api' - target: '/root' + target: '/root/packagecloud_api' - shell: !include-raw-escape: - ../scripts/setup_executor_env.sh @@ -691,14 +593,10 @@ - ../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 - - - provide-maven-settings: - settings-file: 'vpp-settings' - global-settings-file: 'global-settings' - shell: !include-raw-escape: - ../scripts/packagecloud_push.sh @@ -715,11 +613,9 @@ node: 'builder-{os}-prod-{executor-arch}' concurrent: true - build-discarder: - daysToKeep: '{build-days-to-keep}' - numToKeep: 100 - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" # Please keep parameters in alphabetical order parameters: @@ -733,12 +629,8 @@ os: '{os}' - project-parameter: project: '{project}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' - - workspace-archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -764,7 +656,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/gcc-build.sh @@ -773,98 +665,9 @@ - fdio-infra-publish # [end] VPP-GCC-VERIFY JOB TEMPLATE -# VPP-CSIT-VERIFY-DEVICE-PERIODIC JOB TEMPLATE -- job-template: - name: 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}' - id: 'vpp-csit-verify-device-periodic' - description: | - - - project-type: freestyle - node: 'csit-builder-{os}-prod-{executor-arch}' - concurrent: true - archive-artifacts: '**/csit_current/**/*.*' - latest-only: false - - build-discarder: - daysToKeep: '{build-days-to-keep}' - numToKeep: 100 - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - - # Please keep parameters in alphabetical order - parameters: - - archive-artifacts-parameter: - artifacts: '{archive-artifacts}' - - gerrit-csit-refspec-parameter - - gerrit-event-comment-text-parameter - - gerrit-event-type-parameter - - gerrit-parameter: - branch: '{branch}' - - gerrit-refspec-parameter: - refspec: '{branch-refspec}' - - make-parallel-jobs-parameter: - make-parallel-jobs: '{make-parallel-jobs}' - - os-parameter: - os: '{os}' - - project-parameter: - project: '{project}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.ubuntu.bionic.main' - - stream-parameter: - stream: '{stream}' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'default' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '90' - - 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_dpdk_dev_env.sh - - shell: - !include-raw-escape: - - ../scripts/vpp/csit-device.sh - - publishers: - - robot-report: - output-path: 'archives' - - - fdio-infra-publish -# [end] VPP-CSIT-VERIFY-DEVICE-PERIODIC 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: |