1 files changed, 4 insertions, 44 deletions
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 5a157285c..e8de49c85 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -38,9 +38,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
-          branch-refspec: ''
       - '2202':
           branch: 'stable/2202'
           branch-refspec: ''
@@ -71,9 +68,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
-          branch-refspec: ''
       - '2202':
           branch: 'stable/2202'
           branch-refspec: ''
@@ -83,24 +77,10 @@
     os:
       - debian10
       - debian11
-      - ubuntu1804
       - ubuntu2004
     executor-arch: 'x86_64'
     exclude:
-      # OS deprecated on master
-      - stream: 'master'
-        os: 'ubuntu1804'
-      # OS deprecated on 2202
-      - stream: '2202'
-        os: 'ubuntu1804'
-      # OS deprecated on 2206
-      - stream: '2206'
-        os: 'ubuntu1804'
-      # os added in master
-      - stream: '2106'
-        os: 'debian11'
-      - stream: '2110'
-        os: 'debian11'
+      # os added in 22.06
       - stream: '2202'
         os: 'debian11'
 # [end] VPP-X86_64 PROJECT
@@ -141,9 +121,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
-          branch-refspec: ''
       - '2202':
           branch: 'stable/2202'
           branch-refspec: ''
@@ -173,9 +150,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
-          branch-refspec: ''
       - '2202':
           branch: 'stable/2202'
           branch-refspec: ''
@@ -183,19 +157,8 @@
           branch: 'stable/2206'
           branch-refspec: ''
     os:
-      - ubuntu1804
       - ubuntu2004
     executor-arch: 'aarch64'
-    exclude:
-      # OS deprecated on master
-      - stream: 'master'
-        os: 'ubuntu1804'
-      # OS deprecated on 2202
-      - stream: '2202'
-        os: 'ubuntu1804'
-      # OS deprecated on 2206
-      - stream: '2206'
-        os: 'ubuntu1804'
 # [end] VPP-AARCH64 PROJECT
 
 # VPP-CSIT-VERIFY-DEVICE PROJECT
@@ -251,15 +214,9 @@
       - 2n-clx:
           os: 'ubuntu2004'
           executor-arch: 'x86_64'
-      - 2n-skx:
-          os: 'ubuntu2004'
-          executor-arch: 'x86_64'
       - 2n-zn2:
           os: 'ubuntu2004'
           executor-arch: 'x86_64'
-      - 3n-skx:
-          os: 'ubuntu2004'
-          executor-arch: 'x86_64'
       - 3n-icx:
           os: 'ubuntu2004'
           executor-arch: 'x86_64'
@@ -281,6 +238,9 @@
           os: 'ubuntu2004'
           executor-arch: 'aarch64'
           make-parallel-jobs: '16'
+      - 3n-snr:
+          os: 'ubuntu2004'
+          executor-arch: 'x86_64'
 
 # [end] VPP-CSIT-VERIFY-PERF PROJECT