summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docker/scripts/lib_csit.sh1
-rw-r--r--jjb/vpp/docs.yaml2
-rw-r--r--jjb/vpp/vpp-preprod.yaml386
-rw-r--r--jjb/vpp/vpp.yaml38
4 files changed, 16 insertions, 411 deletions
diff --git a/docker/scripts/lib_csit.sh b/docker/scripts/lib_csit.sh
index a4d543666..06cfb471b 100644
--- a/docker/scripts/lib_csit.sh
+++ b/docker/scripts/lib_csit.sh
@@ -91,6 +91,7 @@ csit_install_packages() {
local yaml_files
yaml_files="$(grep -r packages_by $csit_ansible_dir | cut -d: -f1 | sort -u | grep -v $exclude_roles)"
packages="$(dbld_csit_find_ansible_packages.py --$OS_ID --$OS_ARCH $yaml_files)"
+ packages="${packages/jammy /}"
packages="${packages/focal /}"
packages="${packages/noble /}"
packages="${packages/libmbedcrypto1/libmbedcrypto3}"
diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 860625d1f..d3fc92b4b 100644
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -13,8 +13,6 @@
- 'master':
branch: 'master'
branch-refspec: ''
- # TODO: Remove when ubuntu 24.04 is put into production.
- os: 'ubuntu2204'
- '2402':
branch: 'stable/2402'
branch-refspec: ''
diff --git a/jjb/vpp/vpp-preprod.yaml b/jjb/vpp/vpp-preprod.yaml
deleted file mode 100644
index 547b17336..000000000
--- a/jjb/vpp/vpp-preprod.yaml
+++ /dev/null
@@ -1,386 +0,0 @@
-# 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'
- - 'debian12'
- make-parallel-jobs: '4'
- make-test-multiworker-os: 'debian-11 debian-12'
- make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04'
- stream:
- - 'master':
- branch: 'master'
- branch-refspec: 'refs/changes/61/41561/3'
- 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 debian-12'
- 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 8bf84bdd1..d33c36bbc 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -37,8 +37,6 @@
- ubuntu2404
stream:
- 'master':
- # TODO: Remove when ubuntu2404 is put into production
- os: 'ubuntu2204'
branch: 'master'
branch-refspec: ''
- '2402':
@@ -104,12 +102,12 @@
project: 'vpp'
os:
- 'debian11'
+ - 'debian12'
- 'ubuntu2004'
- 'ubuntu2204'
- # TODO: Uncomment when ubuntu 24.04 is put into production
- #- 'ubuntu2404'
+ - 'ubuntu2404'
make-parallel-jobs: '4'
- make-test-multiworker-os: 'debian-11'
+ make-test-multiworker-os: 'debian-11 debian-12'
make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04'
stream:
- 'master':
@@ -129,6 +127,12 @@
# ubuntu-24.04 introduced in VPP 24.10
- stream: '2406'
os: 'ubuntu2404'
+ # debian-12 introduced in VPP 24.10
+ - stream: '2402'
+ os: 'debian12'
+ # debian-12 introduced in VPP 24.10
+ - stream: '2406'
+ os: 'debian12'
# [end] VPP-X86_64 PROJECT
@@ -140,8 +144,7 @@
project: 'vpp'
os:
- 'ubuntu2004'
- # TODO: Uncomment when ubuntu 24.04 is put into production
- #- 'ubuntu2404'
+ - 'ubuntu2404'
make-parallel-jobs: '4'
executor-arch: 'x86_64'
stream:
@@ -204,8 +207,6 @@
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'
@@ -225,14 +226,12 @@
jobs:
- 'vpp-cov-verify-{stream}-{os}-{executor-arch}'
project: 'vpp'
- os: 'ubuntu2404'
+ os: 'ubuntu2004'
make-parallel-jobs: '4'
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
@@ -257,10 +256,9 @@
- 'vpp-merge-{stream}-{os}-{executor-arch}'
project: 'vpp'
os:
- - ubuntu2004
- - ubuntu2204
- # TODO: Uncomment when ubuntu 24.04 is put into production
- #- 'ubuntu2404'
+ - 'ubuntu2004'
+ - 'ubuntu2204'
+ - 'ubuntu2404'
make-parallel-jobs: '4'
make-test-multiworker-os: 'debian-11'
make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04'
@@ -291,7 +289,7 @@
- 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}':
make-parallel-jobs: '32'
project: 'vpp'
- os: 'ubuntu2404'
+ os: 'ubuntu2204'
skip-vote: 'true'
stream:
- 'master':
@@ -299,13 +297,9 @@
branch-refspec: ''
testbed-arch:
- 1n-spr:
- # TODO: Remove when ubuntu2404 is put into production
- os: 'ubuntu2204'
executor-arch: 'x86_64'
skip-vote: 'true'
- 1n-alt:
- # TODO: Remove when ubuntu2404 is put into production
- os: 'ubuntu2204'
executor-arch: 'aarch64'
skip-vote: 'true'
# [end] VPP-CSIT-VERIFY-DEVICE PROJECT
@@ -369,8 +363,6 @@
- 'master':
branch: 'master'
branch-refspec: ''
- # TODO: Remove when ubuntu2404 is put into production
- os: 'ubuntu2204'
- '2402':
branch: 'stable/2402'
branch-refspec: ''