X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fnetvirt%2Fnetvirt-patch-test.yaml;h=e06bfba5440f347a193839e2fdbff46af576bf33;hb=9df3f548230c398ce40a07501a6c2fa58f77134f;hp=9d96ba63aa53264b96df0f2809d071dd5b15dfed;hpb=2891eeeb7a384dbe7a73e65aa0203efdb8f6be9e;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index 9d96ba63a..e06bfba54 100644
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: netvirt-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'netvirt'
@@ -11,18 +11,20 @@
     stream:
       - oxygen:
           branch: 'master'
-          os-branch: 'pike'
+          # 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'
-          os-branch: 'pike'
+          # 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'
-          os-branch: 'newton'
-          karaf-version: karaf3
 
     jdk: 'openjdk8'
 
@@ -39,31 +41,9 @@
       - snat-conntrack:
           csit-list: >
               netvirt-csit-1node-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
-      - hwvtep:
+      - 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-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
+      - l2gw:
           csit-list: >
-              netvirt-legacy-csit-1node-openstack-newton-nodl-v2-gate-{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}
+              netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}