Merge "Remove odlparent-3.0.x jobs"

[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 74fcde32aba979042bc8b7b7a57e50e9d8f5c593..e732525416ffd84e84ffba93945e752810bb8c45 100644 (file)
--- a/jjb/netconf/netconf-patch-test.yaml
+++ b/jjb/netconf/netconf-patch-test.yaml
@@ -2,23 +2,39 @@
 - project:
     name: netconf-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
-    # The project name
     project: 'netconf'
 
-    # Project branches
     stream:
-      - oxygen:
+      - sodium:
           branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+          os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+          os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
+          disable-job: true
 
     feature:
       - core:
           csit-list: >
                 netconf-csit-1node-gate-userfeatures-all-{stream},
                 netconf-csit-1node-gate-callhome-only-{stream}
+
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-only-{stream}