make karaf.log archiving a little better

- will untar all the karaf logs (usually just one) from the tar ball taken
  from each controller, and put them flatly in the archives folder as just
  log files.

- the files will be prepended with odl${i} string to help identify which
  controller it came from in the case of multi controller tests

- the log files are kept as .log format and the nexus archive work will
  gzip it.

Change-Id: I61c6fa3c91eaaf6e6ba36c7f2ed0c19c76195da4
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

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 09137352837b48dd745ebc50cd187beb5104bdab..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
@@ -276,8 +276,8 @@ do
     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"
-    mkdir odl${i} && tar -xvf ${WORKSPACE}/odl${i}_karaf.log.tar -C odl${i}/
-
+    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"