X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-patch-test.yaml;h=3b1f711f35ec572d02969f6efcf73f0600bce393;hb=f8ca610f4ba86fe17fab00137beab7c64fa47097;hp=9d96ba63aa53264b96df0f2809d071dd5b15dfed;hpb=4e87348cb315c95907085f464b9cc2bccba313d3;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index 9d96ba63a..3b1f711f3 100644
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -2,68 +2,66 @@
 - project:
     name: netvirt-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
-    # The project name
     project: 'netvirt'
 
-    # Project branches
     stream:
-      - oxygen:
+      - magnesium:
           branch: 'master'
-          os-branch: 'pike'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          os-branch: 'pike'
-      - carbon:
-          branch: 'stable/carbon'
-          os-branch: 'ocata'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          os-branch: 'newton'
-          karaf-version: karaf3
+          os-branch: 'queens'
+      - sodium:
+          branch: 'stable/sodium'
+          os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
     feature:
       - current:
           csit-list: >
-              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
       - cluster-current:
           csit-list: >
-              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
       - cluster-minimal-current:
           csit-list: >
-               netvirt-csit-3node-openstack-{os-branch}-gate-minimal-cluster-{stream}
+               netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-minimal-cluster-{stream}
       - snat-conntrack:
           csit-list: >
-              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
-      - hwvtep:
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
+      - cluster-snat-conntrack:
           csit-list: >
-              netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}
-
-- project:
-    name: netvirt-legacy-patch-test
-    jobs:
-      - '{project}-patch-test-{feature}-{stream}'
-
-    # The project name
-    project: 'netvirt-legacy'
-
-    # Project branches
-    stream:
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
-          karaf-version: karaf3
-
-    feature:
-      - legacy:
+              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
+      - l2gw:
+          csit-list: >
+              netvirt-csit-hwvtep-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+      - tdd-wip:
+          csit-list: >
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tdd-wip-{stream}
+      - coe:
+          csit-list: >
+              coe-csit-1node-gate-container-networking-only-{stream}
+      - itm-direct-tunnels:
+          csit-list: >
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-itm-direct-tunnels-{stream}
+      - upgrade:
+          csit-list: >
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-upgrade-{stream}
+      - tempest:
+          csit-list: >
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-{stream}
+      - cluster-tempest:
+          csit-list: >
+              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-{stream}
+      - tempest-snat-conntrack:
           csit-list: >
-              netvirt-legacy-csit-1node-openstack-newton-nodl-v2-gate-{stream},
-              netvirt-legacy-csit-1node-openstack-basic-all-{stream}
-      - cluster-legacy:
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream}
+      - cluster-tempest-snat-conntrack:
           csit-list: >
-              netvirt-legacy-csit-3node-openstack-newton-nodl-v2-gate-{stream},
-              netvirt-legacy-csit-3node-clustering-only-{stream}
+              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream}