Remove vpp-*-master-ubuntu1804-* CI jobs.

- As agreed upon at todays VPP Community Meeting

Change-Id: If0874caf9863cea68da065b0d1e4f15e190dd6d6
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index f5164aa..880fcb2 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -84,6 +84,8 @@
       # OS deprecated in master
       - stream: 'master'
         os: 'centos8'
+      - stream: 'master'
+        os: 'ubuntu1804'
       # OS deprecated on 2110
       - stream: '2110'
         os: 'centos8'
@@ -169,6 +171,8 @@
       # OS deprecated in master
       - stream: 'master'
         os: 'centos8'
+      - stream: 'master'
+        os: 'ubuntu1804'
       # OS deprecated in 2110
       - stream: '2110'
         os: 'centos8'
@@ -503,7 +507,7 @@
       - make-test-os-parameter:
           make-test-os: '{make-test-os}'
       - os-parameter:
-          os: 'ubuntu1804'
+          os: '{os}'
       - project-parameter:
           project: '{project}'
       - stream-parameter: