diff options
| -rw-r--r-- | docker/scripts/lib_csit.sh | 4 | ||||
| -rw-r--r-- | docker/scripts/lib_vpp.sh | 6 | ||||
| -rw-r--r-- | jjb/vpp/docs.yaml | 4 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 32 |
4 files changed, 5 insertions, 41 deletions
diff --git a/docker/scripts/lib_csit.sh b/docker/scripts/lib_csit.sh index 06cfb471b..72b32bbd9 100644 --- a/docker/scripts/lib_csit.sh +++ b/docker/scripts/lib_csit.sh @@ -34,8 +34,8 @@ export CIMAN_DOCKER_SCRIPTS="${CIMAN_DOCKER_SCRIPTS:-$(dirname ${BASH_SOURCE[0]} # to create an enumerated set of jobs jobs that match the # definitions here. declare -A CSIT_VPP_BRANCHES -CSIT_VPP_BRANCHES["ubuntu-22.04"]="stable/2406 master" -CSIT_VPP_BRANCHES["ubuntu-24.04"]="master" +CSIT_VPP_BRANCHES["ubuntu-22.04"]="stable/2410 stable/2502 master" +CSIT_VPP_BRANCHES["ubuntu-24.04"]="stable/2410 stable/2502 master" export CSIT_VPP_BRANCHES CSIT_SUPPORTED_EXECUTOR_CLASSES="builder csit_dut" diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh index 3d827a15c..83dd2c9d0 100644 --- a/docker/scripts/lib_vpp.sh +++ b/docker/scripts/lib_vpp.sh @@ -122,7 +122,7 @@ docker_build_setup_vpp() { # to create an enumerated set of jobs jobs that match the # definitions here. declare -A VPP_BRANCHES -VPP_BRANCHES["debian-12"]="stable/2410 master" -VPP_BRANCHES["ubuntu-22.04"]="stable/2406 stable/2410 master" -VPP_BRANCHES["ubuntu-24.04"]="stable/2410 master" +VPP_BRANCHES["debian-12"]="stable/2410 stable/2502 master" +VPP_BRANCHES["ubuntu-22.04"]="stable/2410 stable/2502 master" +VPP_BRANCHES["ubuntu-24.04"]="stable/2410 stable/2502 master" export VPP_BRANCHES diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 92e4249a9..eae79eaf3 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -13,10 +13,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2406': - branch: 'stable/2406' - branch-refspec: '' - os: 'ubuntu2204' - '2410': branch: 'stable/2410' branch-refspec: '' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index af3ae5122..62d95e436 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -39,10 +39,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2406': - os: 'ubuntu2204' - branch: 'stable/2406' - branch-refspec: '' - '2410': os: 'ubuntu2204' branch: 'stable/2410' @@ -115,9 +111,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2406': - branch: 'stable/2406' - branch-refspec: '' - '2410': branch: 'stable/2410' branch-refspec: '' @@ -125,13 +118,6 @@ branch: 'stable/2502' branch-refspec: '' executor-arch: 'x86_64' - exclude: - # ubuntu-24.04 introduced in VPP 24.10 - - stream: '2406' - os: 'ubuntu2404' - # debian-12 introduced in VPP 24.10 - - stream: '2406' - os: 'debian12' # [end] VPP-X86_64 PROJECT @@ -149,19 +135,12 @@ - 'master': branch: 'master' branch-refspec: '' - - '2406': - branch: 'stable/2406' - branch-refspec: '' - '2410': branch: 'stable/2410' branch-refspec: '' - '2502': branch: 'stable/2502' branch-refspec: '' - exclude: - # ubuntu-24.04 introduced in VPP 24.10 - - stream: '2406' - os: 'ubuntu2404' # [end] VPP-GCC-X86_64 PROJECT @@ -260,9 +239,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2406': - branch: 'stable/2406' - branch-refspec: '' - '2410': branch: 'stable/2410' branch-refspec: '' @@ -270,10 +246,6 @@ branch: 'stable/2502' branch-refspec: '' executor-arch: 'aarch64' - exclude: - # ubuntu-24.04 introduced in VPP 24.10 - - stream: '2406' - os: 'ubuntu2404' # [end] VPP-AARCH64 PROJECT # VPP-ARM-DRIVERS-AARCH64 PROJECT @@ -360,10 +332,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2406': - branch: 'stable/2406' - branch-refspec: '' - os: 'ubuntu2204' - '2410': branch: 'stable/2410' branch-refspec: '' |