Use Ocata for netvirt gate csit

[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 6d16f7a610857ad6cbf0fee6954ca52859e134ff..282b5a0fe184a0ccf99dfb90bd81024fcefee81f 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -11,53 +11,43 @@
     stream:
       - 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'
-          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'
+          os-branch: 'ocata'
           karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
-          jdk: 'openjdk8'
+          os-branch: 'newton'
           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}
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
       - cluster-minimal-current:
           csit-list: >
-               netvirt-csit-3node-openstack-ocata-gate-minimal-cluster-{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:
-          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-gate-stateful-snat-conntrack-{stream}
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
       - hwvtep:
           csit-list: >
-              netvirt-csit-hwvtep-1node-openstack-ocata-gate-stateful-{stream}
+              netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}
 
 - project:
     name: netvirt-legacy-patch-test