Merge "Update branch cutting script"

[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 f2037e97607a100ae9fe33249dc9609a24bb904d..a7a896beb0780db0193719cd35a7d1c1897ab863 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -2,81 +2,57 @@
 - 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'
-          jdk: 'openjdk8'
+          # 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'
+      - oxygen:
+          branch: 'stable/oxygen'
+          # 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'
-          jdk: 'openjdk8'
+          # 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'
-          jdk: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
+          os-branch: 'ocata'
           karaf-version: karaf3
 
+    jdk: 'openjdk8'
+
     feature:
       - current:
           csit-list: >
-              netvirt-csit-1node-openstack-ocata-gate-stateful-{stream}
-      - minimal-current:
-          csit-list: >
-              netvirt-csit-1node-openstack-ocata-gate-minimal-stateful-{stream}
-      - tempest-current:
-          csit-list: >
-              netvirt-csit-1node-openstack-ocata-gate-tempest-stateful-{stream}
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
       - cluster-current:
           csit-list: >
-              netvirt-csit-3node-openstack-ocata-gate-stateful-{stream}
-      - nodl-v1-current:
-          csit-list: >
-              netvirt-csit-1node-openstack-newton-gate-stateful-{stream}
-      - learn-current:
-          csit-list: >
-              netvirt-csit-1node-openstack-ocata-gate-learn-{stream}
-      - stateful-current:
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+      - cluster-minimal-current:
           csit-list: >
-              netvirt-csit-1node-openstack-ocata-gate-stateful-{stream}
-      - transparent-current:
-          csit-list: >
-              netvirt-csit-1node-openstack-ocata-gate-transparent-{stream}
+               netvirt-csit-3node-openstack-{os-branch}-gate-minimal-cluster-{stream}
       - snat-conntrack:
           csit-list: >
-              netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-{stream}
-      - hwvtep:
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
+      - cluster-snat-conntrack:
           csit-list: >
-              netvirt-csit-hwvtep-1node-openstack-ocata-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-only-{stream}
-      - cluster-legacy:
+              netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}
+      - tdd-wip:
           csit-list: >
-              netvirt-legacy-csit-3node-openstack-newton-nodl-v2-gate-{stream},
-              netvirt-legacy-csit-3node-clustering-only-{stream}
+              netvirt-csit-1node-openstack-{os-branch}-gate-tdd-wip-{stream}