Merge "Update Ansible playbooks to new names"

[releng/builder.git] / jjb / genius / genius-patch-test.yaml

diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
index 046c7e99e3de7e54041c1067787b378ee354f6ab..50f22777a9443f6f9589a053042da81eb0bc586f 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -1,27 +1,40 @@
+---
 - project:
     name: genius-patch-test
     jobs:
-        - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'genius'
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jdk: 'openjdk8'
-            csit-list: >
-        - boron:
-            branch: 'stable/boron'
-            jdk: 'openjdk8'
+      - oxygen:
+          branch: 'master'
+          os-branch: 'ocata'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          os-branch: 'ocata'
+      - carbon:
+          branch: 'stable/carbon'
+          os-branch: 'ocata'
+          karaf-version: karaf3
+
+    jdk: 'openjdk8'
 
     feature:
-        - netvirt:
-            csit-list: >
-                netvirt-vpnservice-csit-1node-openstack-mitaka-transparent-{stream}
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
 
-        - all:
-            csit-list: >
-                genius-csit-1node-genius-only-{stream},
-                genius-csit-1node-genius-all-{stream}
+      - cluster:
+          csit-list: >
+              genius-csit-3node-gate-all-{stream}