Merge "Fix SC2059 for ShellCheck 0.4.4, printf formatting"

[releng/builder.git] / jjb / groupbasedpolicy / groupbasedpolicy-csit-1node-openstack.yaml

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index a8442ad784172b632586b52d80c283d7c85fd273..732faf41eecfd4210190392bb47318bfba7dbefd 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-openstack-integration
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     # The project name
     project: 'groupbasedpolicy'
@@ -19,24 +19,20 @@
     functionality: 'openstack'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
+      - fluorine:
+          branch: 'stable/fluorine'
+          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
       - oxygen:
           branch: 'stable/oxygen'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
 
     openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
+      - pike:
+          openstack-branch: 'stable/pike'
+          odl-ml2-branch: 'stable/pike'
 
     public-bridge: 'br-int'