From cebbc41fc81d1e64a88a0609ee8c20889b3d249b Mon Sep 17 00:00:00 2001 From: Naveen Joy Date: Thu, 17 Jul 2025 14:07:02 -0700 Subject: [PATCH] chore(vpp): post 25.06 release clean up Change-Id: I43565babc86285b45ff62ba5f5c0a91b0ec81f78 Signed-off-by: Naveen Joy --- docker/scripts/lib_csit.sh | 4 ++-- docker/scripts/lib_vpp.sh | 6 +++--- jjb/vpp/docs.yaml | 4 ---- jjb/vpp/vpp.yaml | 17 ----------------- 4 files changed, 5 insertions(+), 26 deletions(-) diff --git a/docker/scripts/lib_csit.sh b/docker/scripts/lib_csit.sh index f27178c87..4cf6155e2 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/2410 stable/2502 stable/2506 master" -CSIT_VPP_BRANCHES["ubuntu-24.04"]="stable/2410 stable/2502 stable/2506 master" +CSIT_VPP_BRANCHES["ubuntu-22.04"]="stable/2502 stable/2506 master" +CSIT_VPP_BRANCHES["ubuntu-24.04"]="stable/2502 stable/2506 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 706be124d..a1125dcf4 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 stable/2502 stable/2506 master" -VPP_BRANCHES["ubuntu-22.04"]="stable/2410 stable/2502 stable/2506 master" -VPP_BRANCHES["ubuntu-24.04"]="stable/2410 stable/2502 stable/2506 master" +VPP_BRANCHES["debian-12"]="stable/2502 stable/2506 master" +VPP_BRANCHES["ubuntu-22.04"]="stable/2502 stable/2506 master" +VPP_BRANCHES["ubuntu-24.04"]="stable/2502 stable/2506 master" export VPP_BRANCHES diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 7b92578b7..f69e42781 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -13,10 +13,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2410': - branch: 'stable/2410' - branch-refspec: '' - os: 'ubuntu2204' - '2502': branch: 'stable/2502' branch-refspec: '' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 5a60e39d7..79dda5ed0 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -39,10 +39,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2410': - os: 'ubuntu2204' - branch: 'stable/2410' - branch-refspec: '' - '2502': os: 'ubuntu2404' branch: 'stable/2502' @@ -139,9 +135,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2410': - branch: 'stable/2410' - branch-refspec: '' - '2502': branch: 'stable/2502' branch-refspec: '' @@ -166,9 +159,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2410': - branch: 'stable/2410' - branch-refspec: '' - '2502': branch: 'stable/2502' branch-refspec: '' @@ -273,9 +263,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2410': - branch: 'stable/2410' - branch-refspec: '' - '2502': branch: 'stable/2502' branch-refspec: '' @@ -372,10 +359,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2410': - branch: 'stable/2410' - branch-refspec: '' - os: 'ubuntu2204' - '2502': branch: 'stable/2502' branch-refspec: '' -- 2.16.6