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 76d8173b0cc0337b598e85989e63cac217d9321a..abef3f78231a2dc0bc0181e1e374dbe7676b97a7 100644 (file)
--- a/jjb/coe/coe-csit-openstack.yaml
+++ b/jjb/coe/coe-csit-openstack.yaml
@@ -25,17 +25,15 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
 
     openstack:
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
+          openstack_system_image: '{openstack_system_image_ocata}'
 
     create-initial-networks: 'True'