X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-patch-test.yaml;h=b21a906a3276e211c3c81c96be06eb421b82f207;hb=8f5abaab7d3b584d06d7cc0c7ab4525faf53a630;hp=1f331628496518f39f60f7bef0563e27e06717b7;hpb=004bf6173406933d5331727a4b69db5b2ac222c5;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index 1f3316284..b21a906a3 100644
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -1,33 +1,46 @@
+---
 - project:
     name: netvirt-patch-test
     jobs:
-        - '{project}-patch-test-{feature}-{stream}'
+      - '{project}-patch-test-{feature}-{stream}'
 
     # The project name
     project: 'netvirt'
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jdk: 'openjdk8'
+      - oxygen:
+          branch: 'master'
+          # ideally, master (oxygen) would gate against Queens (current master) or 'R' release
+          # bug even the pike devstack environment is still unreliable. so sticking with Ocata
+          # for now
+          os-branch: 'ocata'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          # ideally, master (oxygen) would gate against Queens (current master)
+          # bug even the pike devstack environment is still unreliable. so sticking with Ocata
+          # for now
+          os-branch: 'ocata'
+      - carbon:
+          branch: 'stable/carbon'
+          os-branch: 'ocata'
+          karaf-version: karaf3
 
-        - boron:
-            branch: 'stable/boron'
-            jdk: 'openjdk8'
+    jdk: 'openjdk8'
 
     feature:
-        - legacy:
-            csit-list: >
-                netvirt-legacy-csit-1node-openstack-mitaka-gate-{stream},
-                netvirt-legacy-csit-1node-openstack-basic-only-{stream}
-        - current:
-            csit-list: >
-                netvirt-csit-1node-openstack-mitaka-gate-transparent-{stream}
-        - cluster-legacy:
-            csit-list: >
-                netvirt-legacy-csit-3node-openstack-mitaka-gate-{stream},
-                netvirt-legacy-csit-3node-clustering-only-{stream}
-        - cluster-current:
-            csit-list: >
-                netvirt-csit-3node-openstack-mitaka-gate-transparent-{stream}
+      - current:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+      - cluster-current:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+      - cluster-minimal-current:
+          csit-list: >
+               netvirt-csit-3node-openstack-{os-branch}-gate-minimal-cluster-{stream}
+      - snat-conntrack:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
+      - hwvtep:
+          csit-list: >
+              netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}