From 71a12831f083ee88ccb7e72bedf7d3cc7e15feaf Mon Sep 17 00:00:00 2001 From: Kumar Rishabh Date: Sat, 27 Aug 2016 02:29:18 +0530 Subject: [PATCH] Cleanup Elasticsearch indices before test Change-Id: I9b74c2c780e535afa7ee65db8ee48f24da136f43 Change-Id: I028fbe76782f17be1b0c426ce1169bf075ce6f13 Signed-off-by: Kumar Rishabh --- csit/scripts/set_jvm_common_attribute.sh | 37 +++++++++++++++++------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/csit/scripts/set_jvm_common_attribute.sh b/csit/scripts/set_jvm_common_attribute.sh index 44426c74d0..408910d943 100644 --- a/csit/scripts/set_jvm_common_attribute.sh +++ b/csit/scripts/set_jvm_common_attribute.sh @@ -1,13 +1,5 @@ #!/bin/bash -cat > ${WORKSPACE}/elasticsearch_startup.sh < /dev/null 2>&1 & -ls -al /tmp/elasticsearch/elasticsearch-1.7.5/bin/elasticsearch - -EOF - cat > ${WORKSPACE}/org.apache.karaf.decanter.collector.jmx-local.cfg < ${WORKSPACE}/elasticsearch.yml < ${WORKSPACE}/org.apache.karaf.decanter.appender.elasticsearch.cfg < ${WORKSPACE}/elasticsearch_startup.sh < /dev/null 2>&1 & + ls -al /tmp/elasticsearch/elasticsearch-1.7.5/bin/elasticsearch + +EOF echo "Setup ODL_SYSTEM_IP specific config files for ${!CONTROLLERIP} " cat ${WORKSPACE}/org.apache.karaf.decanter.appender.elasticsearch.cfg @@ -52,6 +65,9 @@ EOF scp ${WORKSPACE}/org.apache.karaf.decanter.collector.jmx-others.cfg ${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/etc/ scp ${WORKSPACE}/elasticsearch.yml ${!CONTROLLERIP}:/tmp/ + + ssh ${!CONTROLLERIP} "sudo ls -al /tmp/elasticsearch/" + ssh ${!CONTROLLERIP} "sudo mv /tmp/elasticsearch.yml /tmp/elasticsearch/elasticsearch-1.7.5/config/" ssh ${!CONTROLLERIP} "cat /tmp/elasticsearch/elasticsearch-1.7.5/config/elasticsearch.yml" @@ -60,5 +76,4 @@ EOF scp ${WORKSPACE}/elasticsearch_startup.sh ${!CONTROLLERIP}:/tmp ssh ${!CONTROLLERIP} 'bash /tmp/elasticsearch_startup.sh' ssh ${!CONTROLLERIP} 'ps aux | grep elasticsearch' - done -- 2.36.6