Merge "Replace `` cmd substitution with $()"

[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 682a5836b9b077bcbb7c0ffefd09338afc27d8e1..f7c04233486ff8bf7abbda0613421fe2d3c887cf 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -49,9 +49,12 @@
           testplan: '{project}-{topology}-tempest-openstack.txt'
 
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
@@ -73,11 +76,11 @@
 
     tools_system_count: 2
 
-    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170406-0546'
 
-    enable-networking-l2gw: 'yes'
+    odl_system_image: 'CentOS 7 - java-builder - 20170403-0948'
 
-    disable-odl-l3-service-plugin: 'yes'
+    enable-networking-l2gw: 'yes'
 
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest,l2gw-plugin'