Merge "Switch global-jjb jobs to use mvn35"

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

diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml
index 9f9560f80e91ff5faf185967f681fbad277e3db0..e0b3e50bcec11cf1381d7f119c726850456b59b7 100644 (file)
--- a/jjb/aaa/aaa-patch-test.yaml
+++ b/jjb/aaa/aaa-patch-test.yaml
@@ -2,23 +2,17 @@
 - project:
     name: aaa-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
-    # The project name
     project: 'aaa'
 
-    # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          jdk: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jdk: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jdk: 'openjdk8'
-          karaf-version: karaf3
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
 
     feature:
       - authn:
@@ -28,3 +22,15 @@
       - keystone:
           csit-list: >
               aaa-csit-1node-keystone-all-{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}