Merge "Update Ansible playbooks to new names"

[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 d726c0fbaac5d334395973a7f233ed46b14815f4..e06bfba5440f347a193839e2fdbff46af576bf33 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -2,57 +2,48 @@
 - project:
     name: netvirt-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'netvirt'
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           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'
+      - 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'
-          jdk: 'openjdk8'
+          os-branch: 'ocata'
+          karaf-version: karaf3
 
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
+    jdk: 'openjdk8'
 
     feature:
-      - legacy:
-          csit-list: >
-              netvirt-legacy-csit-1node-openstack-newton-nodl-v2-gate-{stream},
-              netvirt-legacy-csit-1node-openstack-basic-only-{stream}
       - current:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-stateful-{stream}
-      - minimal-current:
-          csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-minimal-stateful-{stream}
-      - tempest-current:
-          csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-tempest-stateful-{stream}
-      - cluster-legacy:
-          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-stateful-{stream}
       - cluster-current:
           csit-list: >
-              netvirt-csit-3node-openstack-newton-nodl-v2-gate-stateful-{stream}
-      - mitaka-current:
-          csit-list: >
-              netvirt-csit-1node-openstack-mitaka-gate-stateful-{stream}
-      - nodl-v1-current:
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+      - cluster-minimal-current:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-gate-stateful-{stream}
-      - learn-current:
+               netvirt-csit-3node-openstack-{os-branch}-gate-minimal-cluster-{stream}
+      - snat-conntrack:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-learn-{stream}
-      - stateful-current:
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
+      - cluster-snat-conntrack:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-stateful-{stream}
-      - transparent-current:
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
+      - l2gw:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-transparent-{stream}
+              netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}