chore(post-release-cleanup): clean up VPP CI jobs post VPP 23.10 release

[ci-management.git] / docker / scripts / lib_vpp.sh

diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh
index 89ea2b9..312bbf7 100644 (file)
--- a/docker/scripts/lib_vpp.sh
+++ b/docker/scripts/lib_vpp.sh
@@ -1,7 +1,7 @@
 # lib_vpp.sh - Docker build script VPP library.
 #              For import only.
 
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2023 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:
@@ -46,12 +46,9 @@ make_vpp() {
         return
     fi
     git clean -qfdx
-    description="'make UNATTENDED=y $target' in $(pwd) ($branch)"
+    description="'make UNATTENDED=yes $target' in $(pwd) ($branch)"
     echo_log -e "    Starting  $description..."
-    local force_opts="--allow-downgrades --allow-remove-essential"
-    force_opts="$force_opts --allow-change-held-packages"
-    make UNATTENDED=y CONFIRM="-y" FORCE="$force_opts" \
-         $target 2>&1 | tee -a "$bld_log"
+    make UNATTENDED=yes $target 2>&1 | tee -a "$bld_log"
     git checkout -q -- .
     echo_log "    Completed $description!"
 }
@@ -99,10 +96,7 @@ docker_build_setup_vpp() {
 #       to create an enumerated set of jobs jobs that match the
 #       definitions here.
 declare -A VPP_BRANCHES
-VPP_BRANCHES["centos-7"]="stable/2009"
-VPP_BRANCHES["centos-8"]="stable/2009 stable/2101 stable/2106 master"
-VPP_BRANCHES["debian-9"]="stable/2009"
-VPP_BRANCHES["debian-10"]="stable/2009 stable/2101 stable/2106 master"
-VPP_BRANCHES["ubuntu-18.04"]="stable/2009 stable/2101 stable/2106 master"
-VPP_BRANCHES["ubuntu-20.04"]="stable/2009 stable/2101 stable/2106 master"
+VPP_BRANCHES["debian-11"]="stable/2306 stable/2310 master"
+VPP_BRANCHES["ubuntu-20.04"]="stable/2306 stable/2310 master"
+VPP_BRANCHES["ubuntu-22.04"]="stable/2306 stable/2310 master"
 export VPP_BRANCHES