Merge "Consolidate controller parameters into new macro"

[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 3834975a3cf20c9bdfa6698b366063ea9532e47b..8c2119f2cfbe74838d03dabb3bfb9f8a87b1e505 100644 (file)
--- a/jjb/netconf/netconf-patch-test.yaml
+++ b/jjb/netconf/netconf-patch-test.yaml
@@ -7,9 +7,12 @@
     project: 'netconf'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
@@ -22,12 +25,12 @@
 
       - netvirt:
           csit-list: >
-              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
 
       - cluster-netvirt:
           csit-list: >
-              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
 
       - genius:
           csit-list: >
-              genius-csit-1node-gate-all-{stream}
+              genius-csit-1node-gate-only-{stream}