Merge "Remove of-config carbon jobs"

[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 1833a514504421b551fd7ea1405b95a06990818c..194d2d69b6d50fcfbcad0cae4d24bc009f2e8ae1 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -1,45 +1,45 @@
+---
 - project:
     name: netvirt-patch-test
     jobs:
-        - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'netvirt'
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jdk: 'openjdk8'
+      - fluorine:
+          branch: 'master'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          os-branch: 'pike'
 
-        - 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}
-        - minimal-current:
-            csit-list: >
-                netvirt-csit-1node-openstack-mitaka-gate-minimal-transparent-{stream}
-        - tempest-current:
-            csit-list: >
-                netvirt-csit-1node-openstack-mitaka-gate-tempest-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}
-        - newton-current:
-            csit-list: >
-                netvirt-csit-1node-openstack-newton-gate-transparent-{stream}
-        - learn-current:
-            csit-list: >
-                netvirt-csit-1node-openstack-mitaka-gate-learn-{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}
+      - cluster-snat-conntrack:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
+      - l2gw:
+          csit-list: >
+              netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}
+      - tdd-wip:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-tdd-wip-{stream}