diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2021-01-14 14:33:05 -0500 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2021-01-14 14:58:09 -0500 |
| commit | c9a42e7e913f5cf3cd95dfa73bf661b0b03423d7 (patch) | |
| tree | 42f8f5ba38e8ba1fabedbcacfa926ad990a5b1ee /docker/scripts | |
| parent | e1ff59089653304fff894e24eb7c8c574f270c63 (diff) | |
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 <dwallacelf@gmail.com>
Diffstat (limited to 'docker/scripts')
| -rw-r--r-- | docker/scripts/lib_vpp.sh | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh index 74655ff4e..28420611c 100644 --- 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 |