Update Ubuntu 16.04 image

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

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 6d6b9987c93cd5eaa6b7cdb86c97b6345920d559..a5d6460378896b5a3e023fa248797c6f039d09d3 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -38,15 +38,13 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     openstack:
-      - mitaka:
-          openstack-branch: 'stable/mitaka'
-          odl-ml2-branch: 'stable/mitaka'
-          openstack_system_image: 'CentOS 7 - devstack-mitaka - 20170314-2255'
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
@@ -59,9 +57,7 @@
 
     tools_system_count: 2
 
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170406-0546'
-
-    odl_system_image: 'CentOS 7 - java-builder - 20170403-0948'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170516-0740'
 
     enable-networking-l2gw: 'yes'