Merge "Migrate docs-rtd to archive-builds macro"

[releng/builder.git] / jjb / integration / include-raw-integration-deploy-openstack-run-test.sh

diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index fc7781fa6b918eeeef47427f95a15244770294db..e58789936988616c796820bbf96a8ac60983ff6a 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -268,17 +268,16 @@ do
     echo "killing karaf process..."
     ssh "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
 done
+
 sleep 5
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
-    ssh "${!CONTROLLERIP}"  "mv /tmp/${BUNDLEFOLDER}/data/log/ /tmp/odl_log/"
-
-    tar -cf - tar/ | gzip > my.tar.gz
-    ssh "${!CONTROLLERIP}"  'tar -cf "/tmp/odl${i}_karaf.log.tar" "/tmp/odl_log/"'
-    scp "${!CONTROLLERIP}:/tmp/odl${i}_karaf_log.tar" "${WORKSPACE}/odl${i}_karaf.log.tar"
-    tar -xvf ${WORKSPACE}/odl${i}_karaf.log.tar odl${1}/
-
+    ssh "${!CONTROLLERIP}"  "cp -r /tmp/${BUNDLEFOLDER}/data/log /tmp/odl_log"
+    ssh "${!CONTROLLERIP}"  "tar -cf /tmp/odl${i}_karaf.log.tar /tmp/odl_log/*"
+    scp "${!CONTROLLERIP}:/tmp/odl${i}_karaf.log.tar" "${WORKSPACE}/odl${i}_karaf.log.tar"
+    tar -xvf ${WORKSPACE}/odl${i}_karaf.log.tar -C . --strip-components 2 --transform s/karaf/odl${i}_karaf/g
+    rm ${WORKSPACE}/odl${i}_karaf.log.tar
 done
 
 scp ${OPENSTACK_CONTROL_NODE_IP}:/opt/stack/devstack/nohup.out "openstack_control_stack.log"