diff options
| -rw-r--r-- | docker/scripts/lib_vpp.sh | 6 | ||||
| -rw-r--r-- | jjb/vpp/docs.yaml | 8 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 28 |
3 files changed, 4 insertions, 38 deletions
diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh index 6b36338f4..71cb5fb84 100644 --- a/docker/scripts/lib_vpp.sh +++ b/docker/scripts/lib_vpp.sh @@ -99,7 +99,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-10"]="stable/2106 stable/2110 stable/2202 master" -VPP_BRANCHES["ubuntu-18.04"]="stable/2106 stable/2110" -VPP_BRANCHES["ubuntu-20.04"]="stable/2106 stable/2110 stable/2202 master" +VPP_BRANCHES["debian-10"]="stable/2110 stable/2202 master" +VPP_BRANCHES["ubuntu-18.04"]="stable/2110" +VPP_BRANCHES["ubuntu-20.04"]="stable/2110 stable/2202 master" export VPP_BRANCHES diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index e4e3c01b6..39e470d34 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -13,9 +13,6 @@ - master: branch: 'master' branch-refspec: '' - - '2106': - branch: 'stable/2106' - branch-refspec: '' - '2110': branch: 'stable/2110' branch-refspec: '' @@ -23,7 +20,7 @@ branch: 'stable/2202' branch-refspec: '' -# TODO: Remove when stable/2106 and stable/2110 are no longer supported. +# TODO: Remove when stable/2110 is no longer supported. - project: name: make-test-docs jobs: @@ -35,9 +32,6 @@ os: 'ubuntu2004' stream: - - '2106': - branch: 'stable/2106' - branch-refspec: '' - '2110': branch: 'stable/2110' branch-refspec: '' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 4f6bfcbf4..059d1e34a 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -38,9 +38,6 @@ - master: branch: 'master' branch-refspec: '' - - '2106': - branch: 'stable/2106' - branch-refspec: '' - '2110': branch: 'stable/2110' branch-refspec: '' @@ -71,9 +68,6 @@ - master: branch: 'master' branch-refspec: '' - - '2106': - branch: 'stable/2106' - branch-refspec: '' - '2110': branch: 'stable/2110' branch-refspec: '' @@ -81,7 +75,6 @@ branch: 'stable/2202' branch-refspec: '' os: - - centos8 - debian10 - ubuntu1804 - ubuntu2004 @@ -89,16 +82,9 @@ exclude: # OS deprecated in master - stream: 'master' - os: 'centos8' - - stream: 'master' os: 'ubuntu1804' - # OS deprecated on 2110 - - stream: '2110' - os: 'centos8' # OS deprecated on 2202 - stream: '2202' - os: 'centos8' - - stream: '2202' os: 'ubuntu1804' # [end] VPP-X86_64 PROJECT @@ -138,9 +124,6 @@ - master: branch: 'master' branch-refspec: '' - - '2106': - branch: 'stable/2106' - branch-refspec: '' - '2110': branch: 'stable/2110' branch-refspec: '' @@ -170,9 +153,6 @@ - master: branch: 'master' branch-refspec: '' - - '2106': - branch: 'stable/2106' - branch-refspec: '' - '2110': branch: 'stable/2110' branch-refspec: '' @@ -180,23 +160,15 @@ branch: 'stable/2202' branch-refspec: '' os: - - centos8 - ubuntu1804 - ubuntu2004 executor-arch: 'aarch64' exclude: # OS deprecated in master - stream: 'master' - os: 'centos8' - - stream: 'master' os: 'ubuntu1804' - # OS deprecated in 2110 - - stream: '2110' - os: 'centos8' # OS deprecated in 2202 - stream: '2202' - os: 'centos8' - - stream: '2202' os: 'ubuntu1804' # [end] VPP-AARCH64 PROJECT |