summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2022-09-20 12:53:09 +0000
committerGerrit Code Review <gerrit@fd.io>2022-09-20 12:53:09 +0000
commit7ddc627fbd166538f82017b1158bad922154a499 (patch)
treeb78a4f2f1ae7b4e93dad8f5bc7b003437de0d982
parent6f8720f9520c81749784492068140edfbcbdbe29 (diff)
parent4fb9bbc55507b60d0738ee724d6bb55b8cb9e54c (diff)
Merge "Add VPP 22.10 branch"
-rw-r--r--jjb/vpp/docs.yaml8
-rw-r--r--jjb/vpp/vpp.yaml39
2 files changed, 43 insertions, 4 deletions
diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 015eaf84..deb22144 100644
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -20,8 +20,14 @@
- '2206':
branch: 'stable/2206'
branch-refspec: ''
+ - '2210':
+ branch: 'stable/2210'
+ branch-refspec: ''
exclude:
- # os deprecated in master (22.10)
+ # os deprecated in 22.10
+ - stream: '2210'
+ os: 'ubuntu2004'
+ # os deprecated in master
- stream: 'master'
os: 'ubuntu2004'
# os added in 22.10
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 24e6e89d..8db4db30 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -46,9 +46,15 @@
- '2206':
branch: 'stable/2206'
branch-refspec: ''
+ - '2210':
+ branch: 'stable/2210'
+ branch-refspec: ''
executor-arch: 'x86_64'
exclude:
- # os deprecated in master (22.10)
+ # os deprecated in 22.10
+ - stream: '2210'
+ os: 'ubuntu2004'
+ # os deprecated in master
- stream: 'master'
os: 'ubuntu2004'
# os added in 22.10
@@ -86,6 +92,9 @@
- '2206':
branch: 'stable/2206'
branch-refspec: ''
+ - '2210':
+ branch: 'stable/2210'
+ branch-refspec: ''
os:
- debian10
- debian11
@@ -93,6 +102,12 @@
- ubuntu2204
executor-arch: 'x86_64'
exclude:
+ # os deprecated in 22.10
+ - stream: '2210'
+ os: 'debian10'
+ # os deprecated in master
+ - stream: 'master'
+ os: 'debian10'
# os added in 22.06
- stream: '2202'
os: 'debian11'
@@ -149,8 +164,14 @@
- '2206':
branch: 'stable/2206'
branch-refspec: ''
+ - '2210':
+ branch: 'stable/2210'
+ branch-refspec: ''
exclude:
- # os deprecated in master (22.10)
+ # os deprecated in 22.10
+ - stream: '2210'
+ os: 'ubuntu2004'
+ # os deprecated in master
- stream: 'master'
os: 'ubuntu2004'
# os added in 22.10
@@ -188,6 +209,9 @@
- '2206':
branch: 'stable/2206'
branch-refspec: ''
+ - '2210':
+ branch: 'stable/2210'
+ branch-refspec: ''
os:
- ubuntu2004
- ubuntu2204
@@ -213,6 +237,9 @@
- 'master':
branch: 'master'
branch-refspec: ''
+ - '2210':
+ branch: 'stable/2210'
+ branch-refspec: ''
testbed-arch:
- 1n-skx:
os: 'ubuntu2204'
@@ -291,11 +318,17 @@
- '2206':
branch: 'stable/2206'
branch-refspec: ''
+ - '2210':
+ branch: 'stable/2210'
+ branch-refspec: ''
os:
- 'ubuntu2004'
- 'ubuntu2204'
exclude:
- # os deprecated in master (22.10)
+ # os deprecated in 22.10
+ - stream: '2210'
+ os: 'ubuntu2004'
+ # os deprecated in master
- stream: 'master'
os: 'ubuntu2004'
# os added in 22.10