diff options
| -rw-r--r-- | docker/scripts/lib_vpp.sh | 8 | ||||
| -rw-r--r-- | jjb/vpp/docs.yaml | 3 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 44 |
3 files changed, 38 insertions, 17 deletions
diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh index ae1a43240..8b9c91dc8 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) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 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: @@ -99,8 +99,8 @@ docker_build_setup_vpp() { # to create an enumerated set of jobs jobs that match the # definitions here. declare -A VPP_BRANCHES -VPP_BRANCHES["debian-10"]="stable/2110 stable/2202 master" -VPP_BRANCHES["debian-11"]="master" +VPP_BRANCHES["debian-10"]="stable/2110 stable/2202 stable/2206 master" +VPP_BRANCHES["debian-11"]="stable/2206 master" VPP_BRANCHES["ubuntu-18.04"]="stable/2110" -VPP_BRANCHES["ubuntu-20.04"]="stable/2110 stable/2202 master" +VPP_BRANCHES["ubuntu-20.04"]="stable/2110 stable/2202 stable/2206 master" export VPP_BRANCHES diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 39e470d34..499793af5 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -19,6 +19,9 @@ - '2202': branch: 'stable/2202' branch-refspec: '' + - '2206': + branch: 'stable/2206' + branch-refspec: '' # TODO: Remove when stable/2110 is no longer supported. - project: diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 8ab25a3fd..1e336c9c6 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 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: @@ -44,6 +44,9 @@ - '2202': branch: 'stable/2202' branch-refspec: '' + - '2206': + branch: 'stable/2206' + branch-refspec: '' executor-arch: 'x86_64' # [end] VPP-CHECKSTYLE-X86_64 PROJECT @@ -74,6 +77,9 @@ - '2202': branch: 'stable/2202' branch-refspec: '' + - '2206': + branch: 'stable/2206' + branch-refspec: '' os: - debian10 - debian11 @@ -81,12 +87,15 @@ - ubuntu2004 executor-arch: 'x86_64' exclude: - # OS deprecated in master + # OS deprecated on master - stream: 'master' os: 'ubuntu1804' # OS deprecated on 2202 - stream: '2202' os: 'ubuntu1804' + # OS deprecated on 2206 + - stream: '2206' + os: 'ubuntu1804' # os added in master - stream: '2106' os: 'debian11' @@ -138,6 +147,9 @@ - '2202': branch: 'stable/2202' branch-refspec: '' + - '2206': + branch: 'stable/2206' + branch-refspec: '' # [end] VPP-GCC-X86_64 PROJECT # VPP-AARCH64 PROJECT @@ -167,17 +179,23 @@ - '2202': branch: 'stable/2202' branch-refspec: '' + - '2206': + branch: 'stable/2206' + branch-refspec: '' os: - ubuntu1804 - ubuntu2004 executor-arch: 'aarch64' exclude: - # OS deprecated in master + # OS deprecated on master - stream: 'master' os: 'ubuntu1804' - # OS deprecated in 2202 + # OS deprecated on 2202 - stream: '2202' os: 'ubuntu1804' + # OS deprecated on 2206 + - stream: '2206' + os: 'ubuntu1804' # [end] VPP-AARCH64 PROJECT # VPP-CSIT-VERIFY-DEVICE PROJECT @@ -192,12 +210,12 @@ - master: branch: 'master' branch-refspec: '' - - '2110': - branch: 'stable/2110' - branch-refspec: '' - '2202': branch: 'stable/2202' branch-refspec: '' + - '2206': + branch: 'stable/2206' + branch-refspec: '' testbed-arch: - 1n-skx: os: 'ubuntu2004' @@ -220,12 +238,12 @@ - master: branch: 'master' branch-refspec: '' - - '2110': - branch: 'stable/2110' - branch-refspec: '' - '2202': branch: 'stable/2202' branch-refspec: '' + - '2206': + branch: 'stable/2206' + branch-refspec: '' testbed-arch: - 2n-icx: os: 'ubuntu2004' @@ -281,12 +299,12 @@ - master: branch: 'master' branch-refspec: '' - - '2110': - branch: 'stable/2110' - branch-refspec: '' - '2202': branch: 'stable/2202' branch-refspec: '' + - '2206': + branch: 'stable/2206' + branch-refspec: '' os: 'ubuntu2004' # [end] VPP-CSIT-API-CRC PROJECT |