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

Signed-off-by: Stanislav Chlebec <stanislav.chlebec@pantheon.tech>
Change-Id: I436459cb40556edf112c1b8376711bedb1b63e7a

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index 33b3f64c6f9b01f0cabf7afed10a13097eecafc3..a22e4628b630c0f5d1d73a684c0ac72753948231 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -340,10 +340,9 @@ echo "Copying config files to ODL Controller folder"
 for i in $(seq 1 ${NUM_ODL_SYSTEM})
 do
         CONTROLLERIP=ODL_SYSTEM_${i}_IP
-        echo "Setup long duration config to ${!CONTROLLERIP}"
-        # We purposely want these variables to expand client-side
+        echo "Set Decanter Polling Period to ${!CONTROLLERIP}"
         # shellcheck disable=SC2029
-        ssh "${!CONTROLLERIP}" "mkdir -p /tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/"
+        ssh "${!CONTROLLERIP}" "mkdir -p \"/tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/\""
         scp "${WORKSPACE}"/org.apache.karaf.decanter.scheduler.simple.cfg "${!CONTROLLERIP}":/tmp/"${BUNDLEFOLDER}"/etc/
 done
 } #function set_elasticsearch_attribute

diff --git a/jjb/netvirt/netvirt-apex-images.yaml b/jjb/netvirt/netvirt-apex-images.yaml
index e484a9484a1193044c17fd4cc0da279c7ee90b7c..4b9ebd50e416f43030eb48bd75b5641458873873 100644 (file)
--- a/jjb/netvirt/netvirt-apex-images.yaml
+++ b/jjb/netvirt/netvirt-apex-images.yaml
@@ -5,7 +5,6 @@
       - 'netvirt-apex-image-management'
 
     project: 'netvirt'
-    elasticsearch-attribute: 'disabled'
     os-cloud: vex
     disable-job: true
 

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 36e2626ffb379831c88b25f1a037161e0945dc66..4d98bd450a529402e5b8991433bf4f2dbca5d29b 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -5,7 +5,6 @@
       - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
-    elasticsearch-attribute: 'disabled'
     stream: 'magnesium'
     branch: 'master'
     jre: 'openjdk11'
@@ -56,7 +55,6 @@
       - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
-    elasticsearch-attribute: 'disabled'
     stream: 'sodium'
     branch: 'stable/sodium'
     testplan: '{project}-{topology}-l2gw-openstack.txt'
@@ -106,7 +104,6 @@
       - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
-    elasticsearch-attribute: 'disabled'
     stream: 'neon'
     branch: 'stable/neon'
     testplan: '{project}-{topology}-l2gw-openstack.txt'

diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml
index 542bb4e481dffa26309018cadbadc7d79a43f32b..3b23bbf1aea954537a717ca7b89c3d3c3d7c6f52 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-apex.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml
@@ -7,7 +7,6 @@
     disable-job: true
 
     project: 'netvirt'
-    elasticsearch-attribute: 'disabled'
     stream:
       - magnesium:
           branch: 'master'

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
index e0da860e9603820a457b02894a74ff8b8f85bdca..4ed7f4ff1c340b45cd2f8955b4c673f09fb80487 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -5,7 +5,6 @@
       - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    elasticsearch-attribute: 'disabled'
 
     stream:
       - magnesium:

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'

diff --git a/jjb/netvirt/netvirt-dependencies.yaml b/jjb/netvirt/netvirt-dependencies.yaml
index 7d8e9e021aaa05b019270f47f86a461c46ceaa97..db1b70c2c417c3de0094fed95efc7880bf7a4fb2 100644 (file)
--- a/jjb/netvirt/netvirt-dependencies.yaml
+++ b/jjb/netvirt/netvirt-dependencies.yaml
@@ -3,7 +3,6 @@
     name: netvirt-thirdparty-quagga-dependencies
     project: 'netvirt'
     project-name: 'netvirt'
-    elasticsearch-attribute: 'disabled'
     jobs:
       - 'netvirt-thirdparty-quagga-{platform}'
 

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index a28c376039c4e6795d8883ac2f25acefbce9bc48..e141afbc2c1a344d53f28104e239a8b9ed86db0f 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -5,7 +5,6 @@
       - inttest-patch-test
 
     project: 'netvirt'
-    elasticsearch-attribute: 'disabled'
 
     stream:
       - magnesium:

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 76b32bc545bf1ebcc151f448e8ac969b02166a5e..03c1962adc7370193f10f7e405f09c5f63117c22 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -22,7 +22,6 @@
 
     project: 'netvirt'
     project-name: 'netvirt'
-    elasticsearch-attribute: 'disabled'
 
     java-version: 'openjdk11'
     mvn-settings: 'netvirt-settings'
@@ -64,7 +63,6 @@
 
     project: 'netvirt'
     project-name: 'netvirt'
-    elasticsearch-attribute: 'disabled'
     mvn-settings: 'netvirt-settings'
     mvn-opts: '-Xmx2048m'
     build-timeout: 90
@@ -104,7 +102,6 @@
 
     project: 'netvirt'
     project-name: 'netvirt'
-    elasticsearch-attribute: 'disabled'
     mvn-settings: 'netvirt-settings'
     mvn-opts: '-Xmx2048m'
     build-timeout: 90
@@ -128,7 +125,6 @@
 
     project: 'netvirt'
     project-name: 'netvirt'
-    elasticsearch-attribute: 'disabled'
     branch: 'master'
     java-version: 'openjdk11'
     mvn-settings: 'netvirt-settings'