revert netvirt jvm disable setting. minor fix for shellcheck's exception

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

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 904d3b90b63f90b34f3c3faf9543ee3493949530..84a1f5ed181e794befea8685ba7acf123a143fc8 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -5,7 +5,6 @@
       - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    elasticsearch-attribute: 'disabled'
     stream: 'magnesium'
     branch: 'master'
     jre: 'openjdk11'
@@ -95,7 +94,6 @@
       - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    elasticsearch-attribute: 'disabled'
     stream: 'sodium'
     branch: 'stable/sodium'
     testplan: '{project}-{topology}-openstack.txt'
@@ -184,7 +182,6 @@
       - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    elasticsearch-attribute: 'disabled'
     stream: 'neon'
     branch: 'stable/neon'
     testplan: '{project}-{topology}-openstack.txt'
@@ -263,7 +260,6 @@
       - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    elasticsearch-attribute: 'disabled'
     security-group-mode: 'stateful'
     odl_system_flavor: odl-highcpu-4
     openstack_system2_flavor: odl-highcpu-8
@@ -311,7 +307,6 @@
       - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    elasticsearch-attribute: 'disabled'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'n-cpu,placement-api,tempest'