Update VPP branches for docker image builder.

- Remove stable/2001 which has been deprecated
- Add stable/2101
- Remove debian-9 from master

Change-Id: I9b88d01bc38284aba5390c4583f1ac6a0e23cba8
Signed-off-by: Dave Wallace <[email protected]>

diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh
index 74655ff..2842061 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) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
@@ -80,11 +80,18 @@ docker_build_setup_vpp() {
 
 # Branches must be listed in chronological order -- oldest stable branch
 # first and master last.
+#
+# Note: CI Jobs for each architecture are maintained in
+#       .../ci-management/jjb/vpp/vpp.yaml
+#       All OS's and branches are included in the 'os' and 'stream'
+#       definitions respectively, then the exclude list maintained
+#       to create an enumerated set of jobs jobs that match the
+#       definitions here.
 declare -A VPP_BRANCHES
-VPP_BRANCHES["centos-7"]="stable/2001 stable/2005 stable/2009"
-VPP_BRANCHES["centos-8"]="stable/2009 master"
-VPP_BRANCHES["debian-9"]="stable/2009 master"
-VPP_BRANCHES["debian-10"]="stable/2009 master"
-VPP_BRANCHES["ubuntu-18.04"]="stable/2001 stable/2005 stable/2009 master"
-VPP_BRANCHES["ubuntu-20.04"]="stable/2009 master"
+VPP_BRANCHES["centos-7"]="stable/2005 stable/2009"
+VPP_BRANCHES["centos-8"]="stable/2009 stable/2101 master"
+VPP_BRANCHES["debian-9"]="stable/2009"
+VPP_BRANCHES["debian-10"]="stable/2009 stable/2101 master"
+VPP_BRANCHES["ubuntu-18.04"]="stable/2005 stable/2009 stable/2101 master"
+VPP_BRANCHES["ubuntu-20.04"]="stable/2009 stable/2101 master"
 export VPP_BRANCHES