Do not specify jre or jdk if default value applies

[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 828cb44ab7163163a1abbe26ac3133621c5d4b17..eba1b27dd1b987855f08a7e72e75cc56d82328a8 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -7,7 +7,6 @@
     project: 'netvirt'
     stream: 'oxygen'
     branch: 'master'
-    jre: 'openjdk8'
 
     topology:
       - 1node:
@@ -35,6 +34,7 @@
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
+          devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
           openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
           openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
       - pike:
@@ -70,7 +70,6 @@
     project: 'netvirt'
     stream: 'nitrogen'
     branch: 'stable/nitrogen'
-    jre: 'openjdk8'
 
     topology:
       - 1node:
@@ -100,6 +99,7 @@
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
+          devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
           openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
           openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
       - pike:
@@ -136,7 +136,6 @@
 
     stream: 'carbon'
     branch: 'stable/carbon'
-    jre: 'openjdk8'
     karaf-version: karaf3
 
     topology:
@@ -167,6 +166,7 @@
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
+          devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
           openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
           openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
       - pike: