X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=bad647f691861451b724d635a19f1014db19645d;hb=88daabbeea422de78927301b41c5a97fd0d6dab0;hp=eaa4d8618ea53122e27d87bfd1a6f758f9469772;hpb=cd25f2a7e7112e25f2b6381a2e0d7edfc5d66573;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index eaa4d8618..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,27 +33,29 @@ jobs: - 'vpp-checkstyle-verify-{stream}-{os}-{executor-arch}' project: 'vpp' + os: 'ubuntu2004' stream: - master: branch: 'master' - os: 'ubuntu2004' - repo-stream-part: 'master' branch-refspec: '' - - '2009': - branch: 'stable/2009' - os: 'ubuntu1804' - repo-stream-part: 'stable.2009' + - '2202': + branch: 'stable/2202' branch-refspec: '' - os: 'ubuntu1804' - - '2101': - branch: 'stable/2101' - os: 'ubuntu1804' - repo-stream-part: 'stable.2101' + - '2206': + branch: 'stable/2206' branch-refspec: '' executor-arch: 'x86_64' # [end] VPP-CHECKSTYLE-X86_64 PROJECT # VPP-X86_64 PROJECT +# +# NOTE: The list of supported branches for each OS are maintained +# in .../ci-management/docker/scripts/lib_vpp.sh +# The job configuration must be derived from that list, thus +# modifications to both should be made at the same time. +# Since x86_64 is the primary development architecture, this +# project definition should be identical to the docker image +# build scripts. Other architectures may be a subset. - project: name: vpp-x86_64 jobs: @@ -61,99 +63,32 @@ - 'vpp-merge-{stream}-{os}-{executor-arch}' project: 'vpp' make-parallel-jobs: '4' - archive-artifacts: '/tmp/vpp-failed-unittests/*/*' + make-test-os: 'ubuntu-20.04' stream: - master: branch: 'master' - repo-stream-part: 'master' branch-refspec: '' - - '2009': - branch: 'stable/2009' - repo-stream-part: 'stable.2009' + - '2202': + branch: 'stable/2202' branch-refspec: '' - - '2101': - branch: 'stable/2101' - repo-stream-part: 'stable.2101' + - '2206': + branch: 'stable/2206' branch-refspec: '' os: - - ubuntu1804: - repo-os-part: 'ubuntu.bionic.main' + - debian10 + - debian11 + - ubuntu2004 executor-arch: 'x86_64' + exclude: + # os added in 22.06 + - stream: '2202' + os: 'debian11' # [end] VPP-X86_64 PROJECT -# VPP-OS-EOL-X86_64 PROJECT -- project: - name: vpp-os-eol-x86_64 - jobs: - - 'vpp-verify-{stream}-{os}-{executor-arch}' - - 'vpp-merge-{stream}-{os}-{executor-arch}' - project: 'vpp' - make-parallel-jobs: '4' - archive-artifacts: '/tmp/vpp-failed-unittests/*/*' - stream: - - '2009': - branch: 'stable/2009' - repo-stream-part: 'stable.2009' - branch-refspec: '' - os: - - centos7: - repo-os-part: 'centos7' - - debian9: - repo-os-part: 'stretch' - executor-arch: 'x86_64' -# [end] VPP-OS-EOL-X86_64 PROJECT - -# VPP-OS-IN-2009-X86_64 PROJECT -# -# This project is used to separate streams which are only -# supported on the OS in the release in which it was added -# or later releases. -# -# For each 'os-in-XXXX', the stream for the release is -# added here in addition to the 'vpp-x86_64' project. -# Each subsequent release is also added to both. -# -# When all of the streams older than the 'os-in-XXXX" have -# been removed from the 'vpp-x86_64' project, then the OSes -# in this project get moved to the 'vpp-x86_64' project and -# this project gets deleted or commented out if it is only -# 'os-in-XXXX' project. -# -- project: - name: vpp-os-in-2009-x86_64 - jobs: - - 'vpp-verify-{stream}-{os}-{executor-arch}' - - 'vpp-merge-{stream}-{os}-{executor-arch}' - project: 'vpp' - make-parallel-jobs: '4' - archive-artifacts: '/tmp/vpp-failed-unittests/*/*' - stream: - - master: - branch: 'master' - repo-stream-part: 'master' - branch-refspec: '' - - '2009': - branch: 'stable/2009' - repo-stream-part: 'stable.2009' - branch-refspec: '' - - '2101': - branch: 'stable/2101' - repo-stream-part: 'stable.2101' - branch-refspec: '' - os: - - centos8: - repo-os-part: 'centos8' - - debian10: - repo-os-part: 'buster' - - ubuntu2004: - repo-os-part: 'ubuntu.focal.main' - executor-arch: 'x86_64' -# [end] VPP-OS-IN-2009-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: @@ -162,60 +97,18 @@ - 'vpp-debug-verify-{stream}-{os}-{executor-arch}' project: 'vpp' make-parallel-jobs: '4' - archive-artifacts: '/tmp/vpp-failed-unittests/*/*' + make-test-os: 'ubuntu-20.04' comment-trigger-value: 'debug-verify' stream: - master: branch: 'master' + branch-refspec: '' # Once per hour periodicity: 'H * * * *' - repo-stream-part: 'master' - branch-refspec: '' - - '2009': - branch: 'stable/2009' - # Once per day - periodicity: 'H H * * *' - repo-stream-part: 'stable.2009' - branch-refspec: '' - os: - - ubuntu2004: - repo-os-part: 'ubuntu.focal.main' + os: 'ubuntu2004' executor-arch: 'x86_64' # [end] VPP-DEBUG-X86_64 PROJECT -# VPP-BETA-X86_64 PROJECT -# -# Beta jobs are experimental jobs for testing new OS versions on master. -# -# They are only manually triggered. Either using the Jenkins WebUI -# 'Build with Parameters' to run a single job or adding 'beta-verify' -# or 'beta-merge' as a comment to run all beta verify or merge jobs. -# -# Once testing is complete, the os is moved to the current -# 'vpp-os-in-XXXX-x86_64' project. If no OSes are being -# tested then this project should be commented out. -# -#- project: -# name: vpp-beta-x86_64 -# jobs: -# - 'vpp-beta-verify-{stream}-{os}-{executor-arch}': -# comment-trigger-value: 'beta-verify' -# - 'vpp-beta-merge-{stream}-{os}-{executor-arch}': -# comment-trigger-value: 'beta-merge' -# project: 'vpp' -# make-parallel-jobs: '4' -# archive-artifacts: '/tmp/vpp-failed-unittests/*/*' -# stream: -# - master: -# branch: 'master' -# repo-stream-part: 'master' -# branch-refspec: '' -# os: -# - debian10: -# repo-os-part: 'buster' -# executor-arch: x86_64 -# [end] VPP-BETA-X86_64 PROJECT - # VPP-GCC-X86_64 PROJECT - project: name: vpp-gcc-x86_64 @@ -223,25 +116,28 @@ - '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' - repo-stream-part: 'master' branch-refspec: '' - - '2009': - branch: 'stable/2009' - repo-stream-part: 'stable.2009' + - '2202': + branch: 'stable/2202' branch-refspec: '' - - '2101': - branch: 'stable/2101' - repo-stream-part: 'stable.2101' + - '2206': + branch: 'stable/2206' branch-refspec: '' # [end] VPP-GCC-X86_64 PROJECT # VPP-AARCH64 PROJECT +# +# NOTE: The list of supported branches for each OS are maintained +# in .../ci-management/docker/scripts/lib_vpp.sh +# The job configuration must be derived from that list, thus +# modifications to both should be made at the same time. +# The AARCH64 architecture is in the process of catching up +# with X86_64 in terms of OS coverage. Thus the jobs are +# a subset of those defined in the docker image build script. - project: name: vpp-aarch64 jobs: @@ -249,161 +145,110 @@ - 'vpp-merge-{stream}-{os}-{executor-arch}' project: 'vpp' make-parallel-jobs: '16' - archive-artifacts: '/tmp/vpp-failed-unittests/*/*' + make-test-os: 'ubuntu-20.04' stream: - master: branch: 'master' - repo-stream-part: 'master' branch-refspec: '' - - '2009': - branch: 'stable/2009' - repo-stream-part: 'stable.2009' + - '2202': + branch: 'stable/2202' branch-refspec: '' - - '2101': - branch: 'stable/2101' - repo-stream-part: 'stable.2101' + - '2206': + branch: 'stable/2206' branch-refspec: '' os: - - centos8: - repo-os-part: 'centos8' - - ubuntu1804: - repo-os-part: 'ubuntu-arm.bionic.main' + - ubuntu2004 executor-arch: 'aarch64' - exclude: - # OS introduced after 2009 - - stream: '2009' - os: 'centos8' - # OS introduced after 2101 - - stream: '2101' - os: 'centos8' # [end] VPP-AARCH64 PROJECT -# VPP-OS-IN-2009-AARCH64 PROJECT -# -# This project is used to separate streams which are only -# supported on the OS in the release in which it was added -# or later releases. -# -# For each 'os-in-XXXX', the stream for the release is -# added here in addition to the 'vpp-aarch64' project. -# Each subsequent release is also added to both. -# -# When all of the streams older than the 'os-in-XXXX" have -# been removed from the 'vpp-aarch64' project, then the OSes -# in this project get moved to the 'vpp-aarch64' project and -# this project gets deleted or commented out if it is only -# 'os-in-XXXX' project. -# -#- project: -# name: vpp-os-in-2009-aarch64 -# jobs: -# - 'vpp-verify-{stream}-{os}-{executor-arch}' -# - 'vpp-merge-{stream}-{os}-{executor-arch}' -# -# project: 'vpp' -# make-parallel-jobs: '16' -# archive-artifacts: '/tmp/vpp-failed-unittests/*/*' -# stream: -# - master: -# branch: 'master' -# repo-stream-part: 'master' -# branch-refspec: '' -# - '2009': -# branch: 'stable/2009' -# repo-stream-part: 'stable.2009' -# branch-refspec: '' -# os: -# - ubuntu2004: -# repo-os-part: 'ubuntu.focal.main' -# executor-arch: 'aarch64' -# [end] VPP-OS-IN-2009-AARCH64 PROJECT - -# VPP-BETA-AARCH64 PROJECT -# -# Beta jobs are experimental jobs for testing new OS versions on master. -# -# They are only manually triggered. Either using the Jenkins WebUI -# 'Build with Parameters' to run a single job or adding 'beta-verify' -# or 'beta-merge' as a comment to run all beta verify or merge jobs. -# -# Once testing is complete, the os is moved to the current -# 'vpp-os-in-XXXX-aarch64' project. If no OSes are being -# tested then this project should be commented out. -# +# VPP-CSIT-VERIFY-DEVICE PROJECT - project: - name: vpp-beta-aarch64 + name: vpp-csit-verify-device jobs: - - 'vpp-beta-verify-{stream}-{os}-{executor-arch}': - comment-trigger-value: 'beta-verify' - - 'vpp-beta-merge-{stream}-{os}-{executor-arch}': - comment-trigger-value: 'beta-merge' + - 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}': + make-parallel-jobs: '32' project: 'vpp' - make-parallel-jobs: '16' - archive-artifacts: '/tmp/vpp-failed-unittests/*/*' + skip-vote: 'false' stream: - master: branch: 'master' - repo-stream-part: 'master' branch-refspec: '' - os: - - ubuntu2004: - repo-os-part: 'ubuntu.focal.main' - executor-arch: aarch64 -# [end] VPP-BETA-AARCH64 PROJECT + - '2202': + branch: 'stable/2202' + branch-refspec: '' + - '2206': + branch: 'stable/2206' + branch-refspec: '' + testbed-arch: + - 1n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 1n-tx2: + os: 'ubuntu2004' + executor-arch: 'aarch64' + skip-vote: 'true' + +# [end] VPP-CSIT-VERIFY-DEVICE PROJECT -# VPP-CSIT-VERIFY PROJECT +# VPP-CSIT-VERIFY-PERF PROJECT - project: - name: vpp-csit-verify + name: vpp-csit-verify-perf jobs: - - 'vpp-csit-verify-device-perpatch': - make-parallel-jobs: '32' - exclude: - - device-node-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' - - device-node-arch: '1n-skx' - - 'vpp-csit-verify-perf-{stream}-{node-arch}' + - 'vpp-csit-verify-perf-{stream}-{os}-{executor-arch}-{testbed-arch}' project: 'vpp' - os: ubuntu1804 - device-executor: 'vpp-csit-device' - executor: '{os}-us' skip-vote: 'false' stream: - master: branch: 'master' - repo-stream-part: 'master' - - '2009': - branch: 'stable/2009' - repo-stream-part: 'stable.2009' - - '2101': - branch: 'stable/2101' - repo-stream-part: 'stable.2101' - device-node-arch: - - 1n-skx - - 1n-tx2: - device-executor: 'vpp-csit-arm-ubuntu18' - node-arch: - - 2n-clx - - 2n-skx - - 2n-zn2 - - 3n-skx - - 3n-hsw - - 2n-dnv - - 3n-dnv + branch-refspec: '' + - '2202': + branch: 'stable/2202' + branch-refspec: '' + - '2206': + branch: 'stable/2206' + branch-refspec: '' + testbed-arch: + - 2n-icx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-clx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-zn2: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-icx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-dnv: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-dnv: + os: 'ubuntu2004' + executor-arch: 'x86_64' - 3n-tsh: - executor: 'ubuntu1804arm-s' + os: 'ubuntu2004' + executor-arch: 'aarch64' + make-parallel-jobs: '16' + - 3n-alt: + os: 'ubuntu2004' + executor-arch: 'aarch64' make-parallel-jobs: '16' - 2n-tx2: - executor: 'ubuntu1804arm-s' + os: 'ubuntu2004' + executor-arch: 'aarch64' make-parallel-jobs: '16' + - 3n-snr: + os: 'ubuntu2004' + executor-arch: 'x86_64' -# [end] VPP-CSIT-VERIFY PROJECT +# [end] VPP-CSIT-VERIFY-PERF PROJECT # VPP-CSIT-API-CRC PROJECT # @@ -412,20 +257,21 @@ - project: name: vpp-csit-api-crc jobs: - - 'vpp-csit-verify-api-crc-{stream}' + - 'vpp-csit-verify-api-crc-{stream}-{os}-{executor-arch}' project: 'vpp' - executor: 'vpp-csit-device' + executor-arch: 'x86_64' skip-vote: 'false' stream: - - '2009': - branch: 'stable/2009' - repo-stream-part: 'stable.2009' - - '2101': - branch: 'stable/2101' - repo-stream-part: 'stable.2101' - master: branch: 'master' - os: ubuntu1804 + branch-refspec: '' + - '2202': + branch: 'stable/2202' + branch-refspec: '' + - '2206': + branch: 'stable/2206' + branch-refspec: '' + os: 'ubuntu2004' # [end] VPP-CSIT-API-CRC PROJECT # LF RELENG VPP PROJECTS @@ -459,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: @@ -475,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: @@ -527,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' @@ -562,6 +400,9 @@ - shell: !include-raw-escape: - ../scripts/vpp/commitmsg.sh + - shell: + !include-raw-escape: + - ../scripts/vpp/docs_spell.sh publishers: - fdio-infra-publish @@ -576,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: @@ -590,16 +429,14 @@ refspec: '{branch-refspec}' - 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}' - - 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: @@ -625,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 @@ -642,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: @@ -656,22 +491,20 @@ refspec: '{branch-refspec}' - make-parallel-jobs-parameter: make-parallel-jobs: '{make-parallel-jobs}' + - 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: credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'default' + choosing-strategy: 'gerrit' wrappers: - fdio-infra-wrappers: @@ -693,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 @@ -709,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: @@ -721,16 +552,14 @@ 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}' - - 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: @@ -751,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 @@ -764,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 @@ -780,151 +605,6 @@ - fdio-infra-publish # [end] VPP-MERGE JOB TEMPLATE -# VPP-BETA-VERIFY JOB TEMPLATE -- job-template: - name: 'vpp-beta-verify-{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}' - - # 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}' - - os-parameter: - 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: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - fdio-infra-wrappers: - build-timeout: 120 - - triggers: - - 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/build.sh - - publishers: - - fdio-infra-publish -# [end] VPP-BETA-VERIFY JOB TEMPLATE - -# VPP-BETA-MERGE JOB TEMPLATE -- job-template: - name: 'vpp-beta-merge-{stream}-{os}-{executor-arch}' - - 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}' - - # Please keep parameters in alphabetical order - parameters: - - gerrit-parameter: - branch: '{branch}' - - 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}.{repo-os-part}' - - stream-parameter: - stream: '{stream}' - - workspace-archive-artifacts-parameter: - artifacts: '{archive-artifacts}' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'default' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - 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 - - shell: - !include-raw-escape: - - ../scripts/vpp/checkstyle.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/build.sh - - shell: - !include-raw-escape: - - ../scripts/packagecloud_push.sh - - publishers: - - fdio-infra-publish -# [end] VPP-BETA-MERGE JOB TEMPLATE - # VPP-GCC-VERIFY JOB TEMPLATE - job-template: name: 'vpp-gcc-verify-{stream}-{os}-{executor-arch}' @@ -933,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: @@ -951,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: @@ -982,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 @@ -991,132 +665,45 @@ - fdio-infra-publish # [end] VPP-GCC-VERIFY JOB TEMPLATE -# VPP-CSIT-VERIFY-DEVICE-PERIODIC JOB TEMPLATE +# VPP-CSIT-VERIFY-DEVICE-PERPATCH JOB TEMPLATE - job-template: - name: 'vpp-csit-verify-device-{stream}-{device-node-arch}' - id: vpp-csit-verify-device-periodic + name: 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}' description: | - - project-type: freestyle - node: '{device-executor}' - 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: - - 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-shiplogs: - maven-version: 'mvn36' -# [end] VPP-CSIT-VERIFY-DEVICE-PERIODIC JOB TEMPLATE - -# VPP-CSIT-VERIFY-DEVICE-PERPATCH JOB TEMPLATE -- job-template: - name: 'vpp-csit-verify-device-{stream}-{device-node-arch}' - id: vpp-csit-verify-device-perpatch - description: | - project-type: freestyle - node: '{device-executor}' + 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}' + 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 + - 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}' @@ -1145,27 +732,27 @@ - ../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 publishers: - - robot-report: - output-path: 'archives' - - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - fdio-infra-publish # [end] VPP-CSIT-VERIFY-DEVICE-PERPATCH JOB TEMPLATE # VPP-CSIT-VERIFY-PERF JOB TEMPLATE - job-template: - name: 'vpp-csit-verify-perf-{stream}-{node-arch}' + name: 'vpp-csit-verify-perf-{stream}-{os}-{executor-arch}-{testbed-arch}' description: | project-type: freestyle - node: '{executor}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: true - archive-artifacts: > - **/csit_current/**/*.* - **/csit_parent/**/*.* 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}' - csit-perf-trial-duration-parameter: csit-perf-trial-duration: "10.0" - csit-perf-trial-multiplicity-parameter: @@ -1198,7 +778,8 @@ - gerrit-csit-refspec-parameter - gerrit-event-comment-text-parameter - gerrit-event-type-parameter - - gerrit-refspec-parameter + - gerrit-refspec-parameter: + refspec: '{branch-refspec}' - gerrit-parameter: branch: '{branch}' - make-parallel-jobs-parameter: @@ -1207,8 +788,6 @@ os: '{os}' - project-parameter: project: '{project}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.ubuntu.bionic.main' - stream-parameter: stream: '{stream}' @@ -1226,7 +805,7 @@ - gerrit-trigger-csit-perftest: project: '{project}' branch: '{branch}' - trigger-word: 'perftest-{node-arch}' + trigger-word: 'perftest-{testbed-arch}' skip-vote: true builders: @@ -1238,38 +817,46 @@ - ../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-perf.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 - robot-report: - output-path: 'csit_current/0/' + output-path: 'archives/csit_current/0/' - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - fdio-infra-publish # [end] VPP-CSIT-VERIFY-PERF JOB TEMPLATE # VPP-CSIT-VERIFY-API-CRC JOB TEMPLATE - job-template: - name: 'vpp-csit-verify-api-crc-{stream}' + name: 'vpp-csit-verify-api-crc-{stream}-{os}-{executor-arch}' project-type: freestyle - node: '{os}-us' + node: 'builder-{os}-prod-{executor-arch}' concurrent: true 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}' # Not sure whether not failing has any useful usage, # but it does not hurt to have some flexibility for future. - csit-fail-on-crc-mismatch-parameter: @@ -1277,7 +864,8 @@ - gerrit-csit-refspec-parameter - gerrit-parameter: branch: '{branch}' - - gerrit-refspec-parameter + - gerrit-refspec-parameter: + refspec: '{branch-refspec}' - project-parameter: project: '{project}' - stream-parameter: @@ -1308,10 +896,9 @@ - shell: !include-raw-escape: - ../scripts/vpp/check_crc.sh - # TODO: Add sending e-mail notifications to vpp-api-dev@lists.fd.io + # TODO: Add sending e-mail notifications to vpp-api-dev@lists.fd.io publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - fdio-infra-publish # [end] VPP-CSIT-VERIFY-API-CRC JOB TEMPLATE # [end] JOB TEMPLATE DEFINITIONS