Merge "Remove neutron 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 b6a3503248f824f88d382ab4012c85537077b618..194d2d69b6d50fcfbcad0cae4d24bc009f2e8ae1 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -2,29 +2,22 @@
 - project:
     name: netvirt-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'netvirt'
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           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'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
       - 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
+          os-branch: 'pike'
 
     jdk: 'openjdk8'
 
@@ -41,6 +34,12 @@
       - 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}