X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=4b3a13251615e5d1ebc2c487a795208e9f7d6c41;hb=cf55023ecfbde00ddcba7b540a2220b0c6e84a9c;hp=7167f6e5496f11344b9c2f172486861b5d23a4e1;hpb=bde817421205a1897d0cd6dfb00fa3c70f2c534e;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 7167f6e54..4b3a13251 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,29 +33,37 @@ jobs: - 'vpp-checkstyle-verify-{stream}-{os}-{executor-arch}' project: 'vpp' + os: + - ubuntu2004 + - ubuntu2204 stream: - - master: + - 'master': branch: 'master' branch-refspec: '' - os: 'ubuntu2004' - repo-stream-part: 'master' - - '2009': - branch: 'stable/2009' + - '2210': + branch: 'stable/2210' branch-refspec: '' - os: 'ubuntu1804' - repo-stream-part: 'stable.2009' - os: 'ubuntu1804' - - '2101': - branch: 'stable/2101' + - '2302': + branch: 'stable/2302' branch-refspec: '' - os: 'ubuntu1804' - repo-stream-part: 'stable.2101' - - '2106': - branch: 'stable/2106' + - '2306': + branch: 'stable/2306' branch-refspec: '' - os: 'ubuntu1804' - repo-stream-part: 'stable.2106' executor-arch: 'x86_64' + exclude: + # os deprecated in 23.06 + - stream: '2306' + os: 'ubuntu2004' + # 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 @@ -74,63 +82,38 @@ - '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: '' - repo-stream-part: 'master' - - '2009': - branch: 'stable/2009' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' + make-test-multiworker-os: 'debian-11' + - '2210': + branch: 'stable/2210' branch-refspec: '' - make-test-os: 'ubuntu-18.04' - repo-stream-part: 'stable.2009' - - '2101': - branch: 'stable/2101' + make-test-os: 'ubuntu-20.04' + make-test-multiworker-os: 'debian-11' + - '2302': + branch: 'stable/2302' branch-refspec: '' - make-test-os: 'ubuntu-18.04' - repo-stream-part: 'stable.2101' - - '2106': - branch: 'stable/2106' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' + make-test-multiworker-os: 'debian-11' + - '2306': + branch: 'stable/2306' branch-refspec: '' - repo-stream-part: 'stable.2106' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' + make-test-multiworker-os: 'debian-11' 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' + - debian11 + - ubuntu2004 + - ubuntu2204 executor-arch: 'x86_64' - exclude: - # OS deprecated in master - - stream: 'master' - os: 'centos7' - - stream: 'master' - os: 'debian9' - # OS deprecated on 2106 - - stream: '2106' - os: 'centos7' - - stream: '2106' - os: 'debian9' - # 2009 LTS supports all OS variants - # OS deprecated in 2101 - - stream: '2101' - os: 'centos7' - - stream: '2101' - os: 'debian9' # [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: @@ -139,55 +122,78 @@ - '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 * * * *' - 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' + 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' - executor-arch: 'x86_64' + make-parallel-jobs: '4' os: - - ubuntu2004: - repo-os-part: 'ubuntu.focal.main' + - ubuntu2004 + - ubuntu2204 + executor-arch: 'x86_64' stream: - - master: + - 'master': branch: 'master' branch-refspec: '' - repo-stream-part: 'master' - - '2009': - branch: 'stable/2009' + - '2210': + branch: 'stable/2210' branch-refspec: '' - repo-stream-part: 'stable.2009' - - '2101': - branch: 'stable/2101' + - '2302': + branch: 'stable/2302' branch-refspec: '' - repo-stream-part: 'stable.2101' - - '2106': - branch: 'stable/2106' + - '2306': + branch: 'stable/2306' branch-refspec: '' - repo-stream-part: 'stable.2106' + exclude: + # os deprecated in 23.06 + - stream: '2306' + os: 'ubuntu2004' + # 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 @@ -205,92 +211,60 @@ - '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: '' - repo-stream-part: 'master' - - '2009': - branch: 'stable/2009' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' + make-test-multiworker-os: '' + - '2210': + branch: 'stable/2210' branch-refspec: '' - make-test-os: 'ubuntu-18.04' - repo-stream-part: 'stable.2009' - - '2101': - branch: 'stable/2101' + make-test-os: 'ubuntu-20.04' + make-test-multiworker-os: '' + - '2302': + branch: 'stable/2302' branch-refspec: '' - make-test-os: 'ubuntu-18.04' - repo-stream-part: 'stable.2101' - - '2106': - branch: 'stable/2106' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' + make-test-multiworker-os: '' + - '2306': + branch: 'stable/2306' branch-refspec: '' - repo-stream-part: 'stable.2106' + make-test-os: 'ubuntu-20.04 ubuntu-22.04' + make-test-multiworker-os: '' os: - - centos8: - repo-os-part: 'centos8' - - ubuntu1804: - repo-os-part: 'ubuntu-arm.bionic.main' - - ubuntu2004: - repo-os-part: 'ubuntu.focal.main' + - ubuntu2004 + - ubuntu2204 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': + - 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}': make-parallel-jobs: '32' - exclude: - - testbed-arch: '1n-tx2' - - 'vpp-csit-verify-device-periodic': - 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: + - 'master': branch: 'master' branch-refspec: '' - repo-stream-part: 'master' - - '2009': - branch: 'stable/2009' + - '2302': + branch: 'stable/2302' branch-refspec: '' - repo-stream-part: 'stable.2009' - - '2101': - branch: 'stable/2101' + - '2306': + branch: 'stable/2306' branch-refspec: '' - repo-stream-part: 'stable.2101' - - '2106': - branch: 'stable/2106' - branch-refspec: '' - repo-stream-part: 'stable.2106' testbed-arch: - 1n-skx: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' + skip-vote: 'true' - 1n-tx2: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'aarch64' - + skip-vote: 'true' # [end] VPP-CSIT-VERIFY-DEVICE PROJECT # VPP-CSIT-VERIFY-PERF PROJECT @@ -301,53 +275,40 @@ project: 'vpp' skip-vote: 'false' stream: - - master: + - 'master': branch: 'master' branch-refspec: '' - repo-stream-part: 'master' - - '2009': - branch: 'stable/2009' - branch-refspec: '' - repo-stream-part: 'stable.2009' - - '2101': - branch: 'stable/2101' - branch-refspec: '' - repo-stream-part: 'stable.2101' - - '2106': - branch: 'stable/2106' - branch-refspec: '' - repo-stream-part: 'stable.2106' 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' - - 3n-hsw: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-dnv: - os: 'ubuntu2004' - 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 @@ -362,22 +323,17 @@ executor-arch: 'x86_64' skip-vote: 'false' stream: - - master: + - 'master': branch: 'master' branch-refspec: '' - - '2009': - branch: 'stable/2009' + - '2302': + branch: 'stable/2302' branch-refspec: '' - repo-stream-part: 'stable.2009' - - '2101': - branch: 'stable/2101' + - '2306': + branch: 'stable/2306' branch-refspec: '' - repo-stream-part: 'stable.2101' - - '2106': - branch: 'stable/2106' - branch-refspec: '' - repo-stream-part: 'stable.2106' - os: ubuntu2004 + os: + - 'ubuntu2204' # [end] VPP-CSIT-API-CRC PROJECT # LF RELENG VPP PROJECTS @@ -411,16 +367,12 @@ 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: - - archive-artifacts-parameter: - artifacts: '{archive-artifacts}' - gerrit-parameter: branch: '{branch}' - gerrit-refspec-parameter: @@ -429,8 +381,6 @@ os: '{os}' - project-parameter: project: '{project}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.ubuntu.bionic.main' scm: - gerrit-trigger-scm: @@ -457,8 +407,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: @@ -479,8 +427,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' @@ -514,6 +460,9 @@ - shell: !include-raw-escape: - ../scripts/vpp/commitmsg.sh + - shell: + !include-raw-escape: + - ../scripts/vpp/docs_spell.sh publishers: - fdio-infra-publish @@ -528,16 +477,12 @@ 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: - - archive-artifacts-parameter: - artifacts: '{archive-artifacts}' - gerrit-parameter: branch: '{branch}' - gerrit-refspec-parameter: @@ -546,12 +491,12 @@ 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: project: '{project}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' @@ -579,7 +524,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 @@ -596,16 +541,12 @@ 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: - - archive-artifacts-parameter: - artifacts: '{archive-artifacts}' - gerrit-parameter: branch: '{branch}' - gerrit-refspec-parameter: @@ -615,11 +556,9 @@ - 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}' @@ -634,9 +573,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}' @@ -649,7 +586,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 @@ -658,18 +595,17 @@ - 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 - 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: @@ -683,12 +619,8 @@ os: '{os}' - project-parameter: project: '{project}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' - - archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -698,22 +630,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' - - config-file-provider: - files: - - file-id: 'packagecloud_api' - target: '/root' - shell: !include-raw-escape: - ../scripts/setup_executor_env.sh @@ -722,123 +648,103 @@ - ../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 - - - provide-maven-settings: - settings-file: 'vpp-settings' - global-settings-file: 'global-settings' - - 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 - 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: - 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: project: '{project}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' - - archive-artifacts-parameter: - artifacts: '{archive-artifacts}' 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 - 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}' + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-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: @@ -849,8 +755,6 @@ os: '{os}' - project-parameter: project: '{project}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.ubuntu.bionic.main' - stream-parameter: stream: '{stream}' @@ -858,16 +762,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}' @@ -880,22 +782,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: - - robot-report: - output-path: 'archives' - - 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: |