From bb3e6cc4961e8b8aa74d9a7d7cfd34c0bed5f243 Mon Sep 17 00:00:00 2001
From: Dave Wallace <dwallacelf@gmail.com>
Date: Fri, 12 Aug 2022 13:59:03 -0400
Subject: Support ubuntu-22.04 docker exector image building & vpp jobs

Change-Id: I71b654cd072288e4ede70285a0740a7f18caa299
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
---
 jjb/vpp/docs.yaml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'jjb/vpp/docs.yaml')

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 05268384c..015eaf840 100644
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -7,10 +7,11 @@
 
     project: 'vpp'
     executor-arch: 'x86_64'
-    os: 'ubuntu2004'
-
+    os:
+      - 'ubuntu2004'
+      - 'ubuntu2204'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
       - '2202':
@@ -19,6 +20,16 @@
       - '2206':
           branch: 'stable/2206'
           branch-refspec: ''
+    exclude:
+      # os deprecated in master (22.10)
+      - stream: 'master'
+        os: 'ubuntu2004'
+      # os added in 22.10
+      - stream: '2202'
+        os: 'ubuntu2204'
+      # os added in 22.10
+      - stream: '2206'
+        os: 'ubuntu2204'
 
 - job-template:
     name: 'vpp-docs-verify-{stream}-{os}-{executor-arch}'
-- 
cgit 1.2.3-korg