Merge "Switch to use global-jjb version of clm and sonar"

[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 e38eabadc5fee84b9d4d7651c095192b41177b58..4d42d19cd478f3093dad543717c667eec9c51d69 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -19,32 +19,21 @@
     functionality: 'openstack'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
+          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'
-          jre: 'openjdk8'
-          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
+          karaf-version: karaf3
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          install-features: 'odl-groupbasedpolicy-neutronmapper,odl-restconf'
 
     openstack:
-      - mitaka:
-          openstack-branch: 'stable/mitaka'
-          odl-ml2-branch: 'stable/mitaka'
-      - liberty:
-          openstack-branch: 'stable/liberty'
-          odl-ml2-branch: 'stable/liberty'
-
-    schedule: 'H H * * *'
+      - newton:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
 
     public-bridge: 'br-int'