diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/csit/csit-perf.yaml | 125 | ||||
| -rw-r--r-- | jjb/csit/csit-tox.yaml | 2 | ||||
| -rw-r--r-- | jjb/csit/csit-vpp-device.yaml | 3 | ||||
| -rw-r--r-- | jjb/scripts/publish_library_py.sh | 10 | ||||
| -rwxr-xr-x | jjb/scripts/vpp/checkstyle.sh | 6 | ||||
| -rwxr-xr-x | jjb/scripts/vpp/debug-hst.sh | 2 | ||||
| -rwxr-xr-x | jjb/scripts/vpp/hst.sh | 2 | ||||
| -rw-r--r-- | jjb/vpp/docs.yaml | 12 | ||||
| -rw-r--r-- | jjb/vpp/vpp-preprod.yaml | 385 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 154 |
10 files changed, 489 insertions, 212 deletions
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml index d9fc66483..d40541084 100644 --- a/jjb/csit/csit-perf.yaml +++ b/jjb/csit/csit-perf.yaml @@ -23,24 +23,15 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -61,24 +52,15 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -111,24 +93,15 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -148,91 +121,72 @@ - master: branch: 'master' branch-id: 'oper' - - '2406': - branch: 'rls2406' - branch-id: 'oper-rls2406' - 'csit-vpp-perf-mrr-daily-master-{node-arch}': node-arch: - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-snr: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-icxd: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3na-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3nb-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 'csit-vpp-perf-hoststack-daily-master-{node-arch}': node-arch: - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3na-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3nb-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 'csit-vpp-perf-mrr-weekly-master-{node-arch}': node-arch: - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' periodicity: '0 0 * * 6' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - periodicity: '0 0 * * 6' - 2n-aws: os: 'ubuntu2204' executor-arch: 'x86_64' @@ -250,9 +204,6 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' @@ -282,24 +233,15 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -321,24 +263,15 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -371,24 +304,15 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -426,24 +350,15 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -476,24 +391,15 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -542,9 +448,6 @@ - master: branch: 'master' branch-id: 'oper' - - '2406': - branch: 'rls2406' - branch-id: 'oper-rls2406' stream_report: - '2406': branch: 'rls2406' diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml index e94645bb0..ae6dacca5 100644 --- a/jjb/csit/csit-tox.yaml +++ b/jjb/csit/csit-tox.yaml @@ -25,8 +25,6 @@ stream: - master: branch: 'master' - - '2406': - branch: 'rls2406' - job-template: name: 'csit-verify-tox-{stream}-{os}-{executor-arch}' diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml index cb5a9b245..b0f7a7bb3 100644 --- a/jjb/csit/csit-vpp-device.yaml +++ b/jjb/csit/csit-vpp-device.yaml @@ -42,9 +42,6 @@ - master: branch: 'master' branch-id: 'oper' - - '2406': - branch: 'rls2406' - branch-id: 'oper-rls2406' - job-template: name: 'csit-vpp-device-report-coverage-{stream}-{node-arch}' diff --git a/jjb/scripts/publish_library_py.sh b/jjb/scripts/publish_library_py.sh index 1cbeb23c0..db60c1dbe 100644 --- a/jjb/scripts/publish_library_py.sh +++ b/jjb/scripts/publish_library_py.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2024 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: @@ -19,7 +19,13 @@ set -exuo pipefail PYTHON_SCRIPT="/w/workspace/publish_library.py" -pip3 install boto3 +OS_CODENAME="$(grep 'VERSION_CODENAME=' /etc/os-release | cut -d= -f2)" +pip_options="" +if [ "$OS_CODENAME" = "noble" ] ; then + pip_options=" --break-system-packages" +fi +# shellcheck disable=SC2086 +pip3 install$pip_options boto3 mkdir -p $(dirname "$PYTHON_SCRIPT") cat >$PYTHON_SCRIPT <<'END_OF_PYTHON_SCRIPT' diff --git a/jjb/scripts/vpp/checkstyle.sh b/jjb/scripts/vpp/checkstyle.sh index 00fc8bdb8..7feae3980 100755 --- a/jjb/scripts/vpp/checkstyle.sh +++ b/jjb/scripts/vpp/checkstyle.sh @@ -34,9 +34,9 @@ if git show --stat | grep -q "$MATRIX_FILE" ; then fi fi -if [ -n "$(grep -E '^checkstyle:' Makefile)" ] +if grep -qE '^checkstyle:' Makefile then - make checkstyle + make UNATTENDED=yes install-deps checkstyle else - echo "Can't find checkstyle target in Makefile - skipping checkstyle" + echo "Can't find checkstyle target in Makefile - skipping checkstyle" fi diff --git a/jjb/scripts/vpp/debug-hst.sh b/jjb/scripts/vpp/debug-hst.sh index 9824eb842..1761d0949 100755 --- a/jjb/scripts/vpp/debug-hst.sh +++ b/jjb/scripts/vpp/debug-hst.sh @@ -58,5 +58,5 @@ if [ -n "$BUILD_ERROR" ] ; then RETVAL="1" fi echo -e "\n$line\n* VPP ${OS_ID^^}-${OS_VERSION_ID}-${OS_ARCH^^}" \ - "BUILD $BUILD_RESULT\n$line\n" + "DEBUG HostStack Test Suite $BUILD_RESULT\n$line\n" exit $RETVAL diff --git a/jjb/scripts/vpp/hst.sh b/jjb/scripts/vpp/hst.sh index 08f075b68..1a5f3cad8 100755 --- a/jjb/scripts/vpp/hst.sh +++ b/jjb/scripts/vpp/hst.sh @@ -62,5 +62,5 @@ if [ -n "$BUILD_ERROR" ] ; then RETVAL="1" fi echo -e "\n$line\n* VPP ${OS_ID^^}-${OS_VERSION_ID}-${OS_ARCH^^}" \ - "BUILD $BUILD_RESULT\n$line\n" + "HostStack Test Suite $BUILD_RESULT\n$line\n" exit $RETVAL diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 1ee98ba8e..860625d1f 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -8,22 +8,22 @@ - 'vpp-docsonly-merge-{stream}-{os}-{executor-arch}' project: 'vpp' - executor-arch: 'x86_64' - os: - - 'ubuntu2204' + os: 'ubuntu2404' stream: - 'master': branch: 'master' branch-refspec: '' - - '2310': - branch: 'stable/2310' - branch-refspec: '' + # TODO: Remove when ubuntu 24.04 is put into production. + os: 'ubuntu2204' - '2402': branch: 'stable/2402' branch-refspec: '' + os: 'ubuntu2204' - '2406': branch: 'stable/2406' branch-refspec: '' + os: 'ubuntu2204' + executor-arch: 'x86_64' - job-template: name: 'vpp-docs-verify-{stream}-{os}-{executor-arch}' diff --git a/jjb/vpp/vpp-preprod.yaml b/jjb/vpp/vpp-preprod.yaml new file mode 100644 index 000000000..a4685211c --- /dev/null +++ b/jjb/vpp/vpp-preprod.yaml @@ -0,0 +1,385 @@ +# Copyright (c) 2024 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: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +# PROJECT DEFINITIONS +# +# Please keep projects grouped in this order: +# vpp-x86_64, vpp-aarch64, vpp-csit +# +# NOTES: +# - The 'branch-refspec' attribute is used for sandbox testing. +# Use the get_gerrit_refspec() bash function in +# .../ci-management/extras/bash/sandbox_test_functions.sh +# to query gerrit for the refspec of HEAD in a branch. +# TODO: see if there is a refspec that works without requiring +# use of get_gerrit_refspec and hand entering the result +# in the WebUI 'Build With Parameters' gerrit refspec field. +# [end] NOTES + +# 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-preprod-x86_64 + jobs: + - 'vpp-preprod-verify-{stream}-{os}-{executor-arch}' + - 'vpp-preprod-merge-{stream}-{os}-{executor-arch}' + project: 'vpp' + os: + - 'ubuntu2404' + make-parallel-jobs: '4' + make-test-multiworker-os: 'debian-11' + make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04' + stream: + - 'master': + branch: 'master' + branch-refspec: '' + executor-arch: 'x86_64' +# [end] VPP-X86_64 PROJECT + +# VPP-GCC-X86_64 PROJECT +- project: + name: vpp-preprod-gcc-x86_64 + jobs: + - 'vpp-preprod-gcc-verify-{stream}-{os}-{executor-arch}' + project: 'vpp' + os: + - 'ubuntu2404' + make-parallel-jobs: '4' + executor-arch: 'x86_64' + stream: + - 'master': + branch: 'master' + branch-refspec: '' +# [end] VPP-GCC-X86_64 PROJECT + +# VPP-DEBUG-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-preprod-debug-x86_64 + jobs: + - 'vpp-preprod-debug-verify-{stream}-{os}-{executor-arch}' + project: 'vpp' + os: 'ubuntu2404' + make-parallel-jobs: '4' + make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04' + comment-trigger-value: 'debug-verify' + stream: + - 'master': + branch: 'master' + branch-refspec: '' + executor-arch: 'x86_64' + +# 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-preprod-aarch64 + jobs: + - 'vpp-preprod-verify-{stream}-{os}-{executor-arch}' + - 'vpp-preprod-merge-{stream}-{os}-{executor-arch}' + project: 'vpp' + os: + - 'ubuntu2404' + make-parallel-jobs: '4' + make-test-multiworker-os: 'debian-11' + make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04' + stream: + - 'master': + branch: 'master' + branch-refspec: '' + executor-arch: 'aarch64' +# [end] VPP-AARCH64 PROJECT + +# JOB TEMPLATE DEFINITIONS +# +# Please keep job templates in the same order as they are referenced +# in the project definitions above. + +# VPP-VERIFY JOB TEMPLATE +- job-template: + name: 'vpp-preprod-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}' + - 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}' + - stream-parameter: + stream: '{stream}' + + 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-checkstyle-nonvoting: + 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/build.sh + + publishers: + - fdio-infra-publish +# [end] VPP-VERIFY JOB TEMPLATE + +# VPP-DEBUG-VERIFY JOB TEMPLATE +- job-template: + name: 'vpp-preprod-debug-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}' + - 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}' + - 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: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-checkstyle-nonvoting: + 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/debug-build.sh + + publishers: + - fdio-infra-publish +# [end] VPP-DEBUG-VERIFY JOB TEMPLATE + +# VPP-MERGE JOB TEMPLATE +- job-template: + name: 'vpp-preprod-merge-{stream}-{os}-{executor-arch}' + + project-type: freestyle + node: 'builder-{os}-prod-{executor-arch}' + + 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}' + - make-test-multiworker-os-parameter: + make-test-multiworker-os: '{make-test-multiworker-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: 120 + + triggers: + - 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_ext_deps.sh + - shell: + !include-raw-escape: + - ../scripts/vpp/build.sh + - shell: + !include-raw-escape: + - ../scripts/packagecloud_push.sh + + publishers: + - fdio-infra-publish +# [end] VPP-MERGE JOB TEMPLATE + +# VPP-GCC-VERIFY JOB TEMPLATE +- job-template: + name: 'vpp-preprod-gcc-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}' + - gerrit-refspec-parameter: + refspec: '{branch-refspec}' + - 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: + build-timeout: 120 + + triggers: + - gerrit-trigger-checkstyle-nonvoting: + 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/gcc-build.sh + + publishers: + - fdio-infra-publish +# [end] VPP-GCC-VERIFY JOB TEMPLATE diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 1024a3946..8bf84bdd1 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 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: @@ -34,18 +34,19 @@ - 'vpp-checkstyle-verify-{stream}-{os}-{executor-arch}' project: 'vpp' os: - - ubuntu2204 + - ubuntu2404 stream: - 'master': + # TODO: Remove when ubuntu2404 is put into production + os: 'ubuntu2204' branch: 'master' branch-refspec: '' - - '2310': - branch: 'stable/2310' - branch-refspec: '' - '2402': + os: 'ubuntu2204' branch: 'stable/2402' branch-refspec: '' - '2406': + os: 'ubuntu2204' branch: 'stable/2406' branch-refspec: '' executor-arch: 'x86_64' @@ -78,6 +79,8 @@ - ubuntu2204 stream: - 'master': + # TODO: Remove when ubuntu2404 is put into production + os: 'ubuntu2204' branch: 'master' branch-refspec: '' executor-arch: 'x86_64' @@ -99,33 +102,34 @@ - 'vpp-verify-{stream}-{os}-{executor-arch}' - 'vpp-merge-{stream}-{os}-{executor-arch}' project: 'vpp' + os: + - 'debian11' + - 'ubuntu2004' + - 'ubuntu2204' + # TODO: Uncomment when ubuntu 24.04 is put into production + #- 'ubuntu2404' make-parallel-jobs: '4' + make-test-multiworker-os: 'debian-11' + make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04' stream: - 'master': branch: 'master' branch-refspec: '' - make-test-os: 'ubuntu-20.04 ubuntu-22.04' - make-test-multiworker-os: 'debian-11' - - '2310': - branch: 'stable/2310' - branch-refspec: '' - make-test-os: 'ubuntu-20.04 ubuntu-22.04' - make-test-multiworker-os: 'debian-11' - '2402': branch: 'stable/2402' branch-refspec: '' - make-test-os: 'ubuntu-20.04 ubuntu-22.04' - make-test-multiworker-os: 'debian-11' - '2406': branch: 'stable/2406' branch-refspec: '' - make-test-os: 'ubuntu-20.04 ubuntu-22.04' - make-test-multiworker-os: 'debian-11' - os: - - debian11 - - ubuntu2004 - - ubuntu2204 executor-arch: 'x86_64' + exclude: + # ubuntu-24.04 introduced in VPP 24.10 + - stream: '2402' + os: 'ubuntu2404' + # ubuntu-24.04 introduced in VPP 24.10 + - stream: '2406' + os: 'ubuntu2404' + # [end] VPP-X86_64 PROJECT # VPP-GCC-X86_64 PROJECT @@ -134,23 +138,29 @@ jobs: - 'vpp-gcc-verify-{stream}-{os}-{executor-arch}' project: 'vpp' - make-parallel-jobs: '4' os: - - ubuntu2204 + - 'ubuntu2004' + # TODO: Uncomment when ubuntu 24.04 is put into production + #- 'ubuntu2404' + make-parallel-jobs: '4' executor-arch: 'x86_64' stream: - 'master': branch: 'master' branch-refspec: '' - - '2310': - branch: 'stable/2310' - branch-refspec: '' - '2402': branch: 'stable/2402' branch-refspec: '' - '2406': branch: 'stable/2406' branch-refspec: '' + exclude: + # ubuntu-24.04 introduced in VPP 24.10 + - stream: '2402' + os: 'ubuntu2404' + # ubuntu-24.04 introduced in VPP 24.10 + - stream: '2406' + os: 'ubuntu2404' # [end] VPP-GCC-X86_64 PROJECT @@ -165,15 +175,16 @@ jobs: - 'vpp-debug-verify-{stream}-{os}-{executor-arch}' project: 'vpp' + os: 'ubuntu2404' make-parallel-jobs: '4' - make-test-os: 'ubuntu-20.04 ubuntu-22.04' + make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04' comment-trigger-value: 'debug-verify' stream: - 'master': + # TODO: Remove when ubuntu2404 is put into production + os: 'ubuntu2204' branch: 'master' branch-refspec: '' - make-test-os: 'ubuntu-20.04 ubuntu-22.04' - os: 'ubuntu2204' executor-arch: 'x86_64' # [end] VPP-DEBUG-X86_64 PROJECT @@ -189,14 +200,15 @@ jobs: - 'vpp-dpdk-rdma-version-mismatch-{stream}-{os}-{executor-arch}' project: 'vpp' - make-test-os: 'ubuntu-20.04 ubuntu-22.04' + os: 'ubuntu2404' comment-trigger-value: 'dpdk-rdma-version-mismatch' stream: - 'master': + # TODO: Remove when ubuntu2404 is put into production + os: 'ubuntu2204' 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 @@ -213,16 +225,18 @@ jobs: - 'vpp-cov-verify-{stream}-{os}-{executor-arch}' project: 'vpp' + os: 'ubuntu2404' make-parallel-jobs: '4' - make-test-os: 'ubuntu-20.04 ubuntu-22.04' + make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04' comment-trigger-value: 'gcov-report' stream: - 'master': + # TODO: Remove when ubuntu2404 is put into production + os: 'ubuntu2204' branch: 'master' branch-refspec: '' # Once per day at 00:25 periodicity: '25 0 * * 0-6' - os: 'ubuntu2004' executor-arch: 'x86_64' # [end] VPP-COV-X86_64 PROJECT @@ -242,32 +256,32 @@ - 'vpp-verify-{stream}-{os}-{executor-arch}' - 'vpp-merge-{stream}-{os}-{executor-arch}' project: 'vpp' + os: + - ubuntu2004 + - ubuntu2204 + # TODO: Uncomment when ubuntu 24.04 is put into production + #- 'ubuntu2404' make-parallel-jobs: '4' + make-test-multiworker-os: 'debian-11' + make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04' stream: - 'master': branch: 'master' branch-refspec: '' - make-test-os: 'ubuntu-20.04 ubuntu-22.04' - make-test-multiworker-os: '' - - '2310': - branch: 'stable/2310' - branch-refspec: '' - make-test-os: 'ubuntu-20.04 ubuntu-22.04' - make-test-multiworker-os: '' - '2402': branch: 'stable/2402' branch-refspec: '' - make-test-os: 'ubuntu-20.04 ubuntu-22.04' - make-test-multiworker-os: '' - '2406': branch: 'stable/2406' branch-refspec: '' - make-test-os: 'ubuntu-20.04 ubuntu-22.04' - make-test-multiworker-os: '' - os: - - ubuntu2004 - - ubuntu2204 executor-arch: 'aarch64' + exclude: + # ubuntu-24.04 introduced in VPP 24.10 + - stream: '2402' + os: 'ubuntu2404' + # ubuntu-24.04 introduced in VPP 24.10 + - stream: '2406' + os: 'ubuntu2404' # [end] VPP-AARCH64 PROJECT # VPP-CSIT-VERIFY-DEVICE PROJECT @@ -277,34 +291,23 @@ - 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}': make-parallel-jobs: '32' project: 'vpp' - skip-vote: 'false' + os: 'ubuntu2404' + skip-vote: 'true' stream: - 'master': branch: 'master' branch-refspec: '' - - '2310': - branch: 'stable/2310' - branch-refspec: '' - - '2402': - branch: 'stable/2402' - branch-refspec: '' - - '2406': - branch: 'stable/2406' - branch-refspec: '' testbed-arch: - 1n-spr: + # TODO: Remove when ubuntu2404 is put into production os: 'ubuntu2204' executor-arch: 'x86_64' - skip-vote: 'false' + skip-vote: 'true' - 1n-alt: + # TODO: Remove when ubuntu2404 is put into production os: 'ubuntu2204' executor-arch: 'aarch64' - skip-vote: 'false' - exclude: - # 1n-alt testbed not supported - # in CSIT prior to 2402 - - testbed-arch: 1n-alt - stream: '2310' + skip-vote: 'true' # [end] VPP-CSIT-VERIFY-DEVICE PROJECT # VPP-CSIT-VERIFY-PERF PROJECT @@ -323,9 +326,6 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' @@ -335,18 +335,10 @@ - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - make-parallel-jobs: '16' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' make-parallel-jobs: '16' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - make-parallel-jobs: '16' - 3n-snr: os: 'ubuntu2204' executor-arch: 'x86_64' @@ -370,23 +362,23 @@ jobs: - 'vpp-csit-verify-api-crc-{stream}-{os}-{executor-arch}' project: 'vpp' + os: ubuntu2404 executor-arch: 'x86_64' skip-vote: 'false' stream: - 'master': branch: 'master' branch-refspec: '' - - '2310': - branch: 'stable/2310' - branch-refspec: '' + # TODO: Remove when ubuntu2404 is put into production + os: 'ubuntu2204' - '2402': branch: 'stable/2402' branch-refspec: '' + os: 'ubuntu2204' - '2406': branch: 'stable/2406' branch-refspec: '' - os: - - 'ubuntu2204' + os: 'ubuntu2204' # [end] VPP-CSIT-API-CRC PROJECT # LF RELENG VPP PROJECTS @@ -780,10 +772,6 @@ 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: |