Merge "Switch global-jjb jobs to use mvn35"

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

diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml
index e406a318ee2d8292b332b67b9634c13ed3df1a03..3834975a3cf20c9bdfa6698b366063ea9532e47b 100644 (file)
--- a/jjb/netconf/netconf-patch-test.yaml
+++ b/jjb/netconf/netconf-patch-test.yaml
@@ -2,26 +2,32 @@
 - project:
     name: netconf-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
-    # The project name
     project: 'netconf'
 
-    # 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:
       - core:
           csit-list: >
                 netconf-csit-1node-gate-userfeatures-all-{stream},
                 netconf-csit-1node-gate-callhome-only-{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}