From 2a731b6fdc17ca3361cdfd7274297b811084f0bb Mon Sep 17 00:00:00 2001
From: Andrew Yourtchenko <ayourtch@gmail.com>
Date: Mon, 20 Sep 2021 12:52:03 +0000
Subject: [PATCH] Changes for VPP 21.10 Release

Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: If4f836d753568f5185176d649e4b4c6806a7e060
---
 jjb/vpp/docs.yaml |  4 ++++
 jjb/vpp/vpp.yaml  | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 18975498f..a8139b6b5 100644
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -27,6 +27,10 @@
           branch: 'stable/2106'
           branch-refspec: ''
           os: 'ubuntu1804'
+      - '2110':
+          branch: 'stable/2110'
+          branch-refspec: ''
+          os: 'ubuntu1804'
 
 - job-template:
     name: 'vpp-docs-verify-{stream}-{os}-{executor-arch}'
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index a4d898b5c..8ef7bb83b 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -55,6 +55,11 @@
           branch-refspec: ''
           os: 'ubuntu1804'
           repo-stream-part: 'stable.2106'
+      - '2110':
+          branch: 'stable/2110'
+          branch-refspec: ''
+          os: 'ubuntu1804'
+          repo-stream-part: 'stable.2110'
     executor-arch: 'x86_64'
 # [end] VPP-CHECKSTYLE-X86_64 PROJECT
 
@@ -94,6 +99,10 @@
           branch: 'stable/2106'
           branch-refspec: ''
           repo-stream-part: 'stable.2106'
+      - '2110':
+          branch: 'stable/2110'
+          branch-refspec: ''
+          repo-stream-part: 'stable.2110'
     os:
       - centos7:
           repo-os-part: 'centos7'
@@ -121,6 +130,13 @@
         os: 'centos7'
       - stream: '2106'
         os: 'debian9'
+      # OS deprecated on 2110
+      - stream: '2110'
+        os: 'centos7'
+      - stream: '2110'
+        os: 'centos8'
+      - stream: '2110'
+        os: 'debian9'
       # 2009 LTS supports all OS variants
       # OS deprecated in 2101
       - stream: '2101'
@@ -190,6 +206,10 @@
           branch: 'stable/2106'
           branch-refspec: ''
           repo-stream-part: 'stable.2106'
+      - '2110':
+          branch: 'stable/2110'
+          branch-refspec: ''
+          repo-stream-part: 'stable.2110'
 # [end] VPP-GCC-X86_64 PROJECT
 
 # VPP-AARCH64 PROJECT
@@ -228,6 +248,10 @@
           branch: 'stable/2106'
           branch-refspec: ''
           repo-stream-part: 'stable.2106'
+      - '2110':
+          branch: 'stable/2110'
+          branch-refspec: ''
+          repo-stream-part: 'stable.2110'
     os:
       - centos8:
           repo-os-part: 'centos8'
@@ -240,6 +264,9 @@
       # OS deprecated in master
       - stream: 'master'
         os: 'centos8'
+      # OS deprecated in 2110
+      - stream: '2110'
+        os: 'centos8'
       # OS introduced after 2009
       - stream: '2009'
         os: 'centos8'
@@ -283,6 +310,10 @@
           branch: 'stable/2106'
           branch-refspec: ''
           repo-stream-part: 'stable.2106'
+      - '2110':
+          branch: 'stable/2110'
+          branch-refspec: ''
+          repo-stream-part: 'stable.2110'
     testbed-arch:
       - 1n-skx:
           os: 'ubuntu2004'
@@ -317,6 +348,10 @@
           branch: 'stable/2106'
           branch-refspec: ''
           repo-stream-part: 'stable.2106'
+      - '2110':
+          branch: 'stable/2110'
+          branch-refspec: ''
+          repo-stream-part: 'stable.2110'
     testbed-arch:
       - 2n-clx:
           os: 'ubuntu2004'
@@ -374,6 +409,10 @@
           branch: 'stable/2106'
           branch-refspec: ''
           repo-stream-part: 'stable.2106'
+      - '2110':
+          branch: 'stable/2110'
+          branch-refspec: ''
+          repo-stream-part: 'stable.2110'
     os: ubuntu2004
 # [end] VPP-CSIT-API-CRC PROJECT
 
-- 
2.16.6