Rework patch test to use right job flavors

[releng/builder.git] / jjb / netvirt / netvirt-patch-test.yaml

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index d6ad65ca94fa93002fef998910d1fe18cc7c4585..9d96ba63aa53264b96df0f2809d071dd5b15dfed 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -9,53 +9,39 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
+          os-branch: 'pike'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          os-branch: 'pike'
       - carbon:
           branch: 'stable/carbon'
-          jdk: 'openjdk8'
+          os-branch: 'ocata'
           karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
-          jdk: 'openjdk8'
+          os-branch: 'newton'
           karaf-version: karaf3
 
+    jdk: 'openjdk8'
+
     feature:
       - current:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-stateful-{stream}
-      - minimal-current:
-          csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-minimal-stateful-{stream}
-      - tempest-current:
-          csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-tempest-stateful-{stream}
-      - cluster-legacy:
-          csit-list: >
-              netvirt-legacy-csit-3node-openstack-newton-nodl-v2-gate-{stream},
-              netvirt-legacy-csit-3node-clustering-only-{stream}
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
       - cluster-current:
           csit-list: >
-              netvirt-csit-3node-openstack-newton-nodl-v2-gate-stateful-{stream}
-      - nodl-v1-current:
-          csit-list: >
-              netvirt-csit-1node-openstack-newton-gate-stateful-{stream}
-      - learn-current:
-          csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-learn-{stream}
-      - stateful-current:
-          csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-stateful-{stream}
-      - transparent-current:
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+      - cluster-minimal-current:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-transparent-{stream}
+               netvirt-csit-3node-openstack-{os-branch}-gate-minimal-cluster-{stream}
       - snat-conntrack:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-{stream}
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
       - hwvtep:
           csit-list: >
-              netvirt-csit-hwvtep-1node-openstack-newton-gate-stateful-{stream}
+              netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}
 
 - project:
     name: netvirt-legacy-patch-test
@@ -76,4 +62,8 @@
       - legacy:
           csit-list: >
               netvirt-legacy-csit-1node-openstack-newton-nodl-v2-gate-{stream},
-              netvirt-legacy-csit-1node-openstack-basic-only-{stream}
+              netvirt-legacy-csit-1node-openstack-basic-all-{stream}
+      - cluster-legacy:
+          csit-list: >
+              netvirt-legacy-csit-3node-openstack-newton-nodl-v2-gate-{stream},
+              netvirt-legacy-csit-3node-clustering-only-{stream}