Merge "Revert "Reduce amount of robot minions allowed""

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

diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml
index 72c78e92955afca339b759a96870dca57b99c036..1ba9d383be03469e4b91533625200f4552f59f2e 100644 (file)
--- a/jjb/odlparent/odlparent-patch-test.yaml
+++ b/jjb/odlparent/odlparent-patch-test.yaml
@@ -7,9 +7,12 @@
     project: 'odlparent'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
@@ -19,12 +22,12 @@
     feature:
       - 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}