archive openstack node logs individually, and not as a tarball

Change-Id: Ie573cfde7fceb82b07f0b07ab5e5d4c5938511b3
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
Signed-off-by: Alon Kochba <alonko@hpe.com>
Signed-off-by: Sam Hague <shague@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 7b48be137c9cb16444840d5a57747c322c177b79..a717b37f56c66ae7591661a3df499f26cf9253f4 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -333,25 +333,37 @@ do
     rm ${WORKSPACE}/odl${i}_karaf.log.tar
 done
 
-scp ${OPENSTACK_CONTROL_NODE_IP}:/opt/stack/devstack/nohup.out "openstack_control_stack.log"
-${SSH} ${OPENSTACK_CONTROL_NODE_IP} "tar -cf /tmp/control_node_openstack_logs.tgz  /opt/stack/logs/*"
-scp "${OPENSTACK_CONTROL_NODE_IP}:/tmp/control_node_openstack_logs.tgz" control_node_openstack_logs.tgz
-scp ${OPENSTACK_CONTROL_NODE_IP}:/var/log/openvswitch/ovs-vswitchd.log "ovs-vswitchd_control.log"
-rm control_ovs-vswitchd.log
+# Since this log collection work is happening before the archive build macro which also
+# creates the ${WORKSPACE}/archives dir, we have to do it here first.  The mkdir in the
+# archives build step will essentially be a noop.
+mkdir -p ${WORKSPACE}/archives
+
+# Control Node
+OS_CTRL_FOLDER="control"
+mkdir -p ${OS_CTRL_FOLDER}
+scp ${OPENSTACK_CONTROL_NODE_IP}:/opt/stack/devstack/nohup.out ${OS_CTRL_FOLDER}/stack.log
+scp ${OPENSTACK_CONTROL_NODE_IP}:/var/log/openvswitch/ovs-vswitchd.log ${OS_CTRL_FOLDER}/ovs-vswitchd.log
+rsync -avhe ssh ${OPENSTACK_CONTROL_NODE_IP}:/opt/stack/logs/* ${OS_CTRL_FOLDER} # rsync to prevent copying of symbolic links
 scp extra_debug.sh ${OPENSTACK_CONTROL_NODE_IP}:/tmp
 ${SSH} ${OPENSTACK_CONTROL_NODE_IP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"
-scp "${OPENSTACK_CONTROL_NODE_IP}:/tmp/extra_debug.log" extra_debug_control.log
+scp ${OPENSTACK_CONTROL_NODE_IP}:/tmp/extra_debug.log ${OS_CTRL_FOLDER}/extra_debug.log
+mv local.conf_control ${OS_CTRL_FOLDER}/local.conf
+mv ${OS_CTRL_FOLDER} ${WORKSPACE}/archives/
+
+# Compute Nodes
 for i in `seq 1 $((NUM_OPENSTACK_SYSTEM - 1))`
 do
     OSIP=OPENSTACK_COMPUTE_NODE_${i}_IP
-    scp "${!OSIP}:/opt/stack/devstack/nohup.out" "openstack_compute_stack_${i}.log"
-    ${SSH} "${!OSIP}" "tar -cf /tmp/compute_node_${i}_openstack_logs.tgz  /opt/stack/logs/*"
-    scp "${!OSIP}:/tmp/compute_node_${i}_openstack_logs.tgz"  "compute_node_${i}_openstack_logs.tgz"
-    scp "${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log" "ovs-vswitchd_compute_${i}.log"
-    rm compute_${1}_ovs-vswitchd.log
-    scp "extra_debug.sh" "${!OSIP}:/tmp"
-    ${SSH} "${!OSIP}" "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"
-    scp "${!OSIP}:/tmp/extra_debug.log" "extra_debug_compute_${i}.log"
+    OS_COMPUTE_FOLDER="compute_${i}"
+    mkdir -p ${OS_COMPUTE_FOLDER}
+    scp ${!OSIP}:/opt/stack/devstack/nohup.out ${OS_COMPUTE_FOLDER}/stack.log
+    scp ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${OS_COMPUTE_FOLDER}/ovs-vswitchd.log
+    rsync -avhe ssh ${!OSIP}:/opt/stack/logs/* ${OS_COMPUTE_FOLDER} # rsync to prevent copying of symbolic links
+    scp extra_debug.sh ${!OSIP}:/tmp
+    ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"
+    scp ${!OSIP}:/tmp/extra_debug.log ${OS_COMPUTE_FOLDER}/extra_debug.log
+    mv local.conf_compute_${!OSIP} ${OS_COMPUTE_FOLDER}/local.conf
+    mv ${OS_COMPUTE_FOLDER} ${WORKSPACE}/archives/
 done
 
 ls local.conf* | xargs -I % mv % %.log

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 5ade45a1b1bd49d50fb477a280bb2ceeb46c9452..a4246f86e63eedaf6a0af0f498b028cd0c7a1fd2 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -506,7 +506,7 @@
             builders:
                 - shell: |
                     #!/bin/bash
-                    mkdir $WORKSPACE/archives
+                    mkdir -p $WORKSPACE/archives
                     curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
                     unzip -d $WORKSPACE/archives robot-plugin.zip
                     mv *log* *.log *.log.gz *.csv *.png $WORKSPACE/archives || true  # Don't fail if file missing