Move GBP openstack branch to newton

[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 7a3c9a6e1ed15d7bd3708c490f3ad8bc16fe8438..1f598940fa10007d71bf9f95bbc4568bdaad8b16 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -19,47 +19,35 @@
     functionality: 'openstack'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           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'
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
           install-features: 'odl-groupbasedpolicy-neutronmapper,odl-restconf'
 
     openstack:
-      - mitaka:
-          openstack-branch: 'stable/mitaka'
-          odl-ml2-branch: 'stable/mitaka'
-          odl-ml2-driver-version: 'v1'
-      - liberty:
-          openstack-branch: 'stable/liberty'
-          odl-ml2-branch: 'stable/liberty'
-          odl-ml2-driver-version: 'v1'
+      - newton:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
 
     schedule: 'H H * * *'
 
-    odl-enable-l3: 'yes'
-
     public-bridge: 'br-int'
 
-    public-physical-network: 'physnet1'
-
-    enable-networking-l2gw: 'no'
-
-    disable-odl-l3-service-plugin: 'no'
-
-    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
-
-    disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
-
-    tenant-network-type: 'vxlan'
+    enable-openstack-plugins: 'networking-odl'
 
     security-group-mode: 'none'
-
-    robot-options: ''