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 3bc42fc1c85e07107fae55ac69714a8b735cc9b8..4d42d19cd478f3093dad543717c667eec9c51d69 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -21,20 +21,12 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
           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
-          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'
 
@@ -43,8 +35,6 @@
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
 
-    schedule: 'H H * * *'
-
     public-bridge: 'br-int'
 
     enable-openstack-plugins: 'networking-odl'