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 6cf71d1397912139fa69b67b3de9563272d43306..50f22777a9443f6f9589a053042da81eb0bc586f 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -2,33 +2,39 @@
 - project:
     name: genius-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'genius'
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
+          os-branch: 'ocata'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          os-branch: 'ocata'
       - carbon:
           branch: 'stable/carbon'
-          jdk: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
+          os-branch: 'ocata'
+          karaf-version: karaf3
+
+    jdk: 'openjdk8'
 
     feature:
       - netvirt:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-stateful-{stream}
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
 
       - cluster-netvirt:
           csit-list: >
-              netvirt-csit-3node-openstack-newton-nodl-v2-gate-stateful-{stream}
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
 
       - genius:
           csit-list: >
-              genius-csit-1node-genius-only-{stream},
-              genius-csit-1node-genius-all-{stream}
+              genius-csit-1node-gate-all-{stream}
+
+      - cluster:
+          csit-list: >
+              genius-csit-3node-gate-all-{stream}