Merge "Migrate snmp to global-jjb Maven jobs"

[releng/builder.git] / jjb / coe / coe-csit-openstack.yaml

diff --git a/jjb/coe/coe-csit-openstack.yaml b/jjb/coe/coe-csit-openstack.yaml
index b1ef2111f9e1c7271394033eb2f4ca0d71c7e9d9..abef3f78231a2dc0bc0181e1e374dbe7676b97a7 100644 (file)
--- a/jjb/coe/coe-csit-openstack.yaml
+++ b/jjb/coe/coe-csit-openstack.yaml
@@ -20,34 +20,30 @@
 
     testplan: '{project}-{topology}-openstack.txt'
 
-    functionality:
-      - kubernetes:
-          schedule: ''
+    functionality: 'kubernetes'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+      - nitrogen:
+          branch: 'stable/nitrogen'
 
     openstack:
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170606-0821'
-
+          openstack_system_image: '{openstack_system_image_ocata}'
 
     create-initial-networks: 'True'
 
     enable-openstack-plugins: 'networking-odl,kuryr-kubernetes,neutron-lbaas'
 
     enable-openstack-services: >
-        q-svc,q-dhcp,q-meta,n-cauth,legacy_etcd,docker,q-lbaasv2,kubernetes-api,
+        legacy_etcd,docker,q-lbaasv2,kubernetes-api,
         kubernetes-controller-manager,kubernetes-scheduler,kubelet,kuryr-kubernetes
 
+    disable-openstack-services: 'etcd3'
+
     lbaas-service-provider: >
         'LOADBALANCERV2:opendaylight:networking_odl.lbaas.driver_v2.OpenDaylightLbaasDriverV2:default'