Replace pike with queens for group based policy

[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 6cafff9293d343d75ee58776fa736907abddbe12..9a4e1bd62e2be531f02c140b2181db5b959311e9 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -2,10 +2,11 @@
 - project:
     name: groupbasedpolicy-csit-openstack-integration
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack-custom
 
     # The project name
     project: 'groupbasedpolicy'
+    disable-job: true
 
     topology:
       - 1node:
@@ -19,24 +20,19 @@
     functionality: 'openstack'
 
     stream:
-      - oxygen:
+      - sodium:
           branch: 'master'
-          jre: 'openjdk8'
+      - neon:
+          branch: 'stable/neon'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+      - fluorine:
+          branch: 'stable/fluorine'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
 
     openstack:
-      - newton:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
+      - queens:
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
 
     public-bridge: 'br-int'