From 4b4b181e7c60540839be836c654dfd9de14d5f27 Mon Sep 17 00:00:00 2001
From: Anthony Lamping <lamping.ap@gmail.com>
Date: Sun, 7 Jan 2018 16:05:52 -0500
Subject: [PATCH] Jenkins: rename rostest xml logs to match mission (#8616)

two xml log files are generated for each rostest. they're named according to the launch file, which is reused for each mission test. currently subsequent tests overwrite the previous test's logs. this renames them after they're generated, appending the mission name to the end of the file name.
---
 Jenkinsfile | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index bbe90443ba..27657d9b98 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -366,6 +366,12 @@ pipeline {
             }
             failure {
               sh './Tools/upload_log.py -q --description "ROS mission test vtol_new_1.txt: ${CHANGE_ID}" --feedback "${CHANGE_TITLE} - ${CHANGE_URL}" --source CI --email "${CHANGE_AUTHOR_EMAIL}" .ros/rootfs/fs/microsd/log/*/*.ulg'
+              sh'''#!/bin/bash -xe
+                    find . -type f -name "ros*.xml" | \
+                        while read f
+                            do mv "$f" "${f/.xml/-vtol_new_1.xml}"
+                        done
+                '''
               archiveArtifacts '**/*.ulg'
               archiveArtifacts '.ros/*/px4/**.xml'
               archiveArtifacts '.ros/log/**.log'
@@ -393,6 +399,12 @@ pipeline {
             }
             failure {
               sh './Tools/upload_log.py -q --description "ROS mission test vtol_new_2.txt: ${CHANGE_ID}" --feedback "${CHANGE_TITLE} - ${CHANGE_URL}" --source CI --email "${CHANGE_AUTHOR_EMAIL}" .ros/rootfs/fs/microsd/log/*/*.ulg'
+              sh'''#!/bin/bash -xe
+                    find . -type f -name "ros*.xml" | \
+                        while read f
+                            do mv "$f" "${f/.xml/-vtol_new_2.xml}"
+                        done
+                '''
               archiveArtifacts '**/*.ulg'
               archiveArtifacts '.ros/*/px4/**.xml'
               archiveArtifacts '.ros/log/**.log'
@@ -420,6 +432,12 @@ pipeline {
             }
             failure {
               sh './Tools/upload_log.py -q --description "ROS mission test vtol_old_1.txt: ${CHANGE_ID}" --feedback "${CHANGE_TITLE} - ${CHANGE_URL}" --source CI --email "${CHANGE_AUTHOR_EMAIL}" .ros/rootfs/fs/microsd/log/*/*.ulg'
+              sh'''#!/bin/bash -xe
+                    find . -type f -name "ros*.xml" | \
+                        while read f
+                            do mv "$f" "${f/.xml/-vtol_old_1.xml}"
+                        done
+                '''
               archiveArtifacts '**/*.ulg'
               archiveArtifacts '.ros/*/px4/**.xml'
               archiveArtifacts '.ros/log/**.log'
@@ -447,6 +465,12 @@ pipeline {
             }
             failure {
               sh './Tools/upload_log.py -q --description "ROS mission test vtol_old_2.txt: ${CHANGE_ID}" --feedback "${CHANGE_TITLE} - ${CHANGE_URL}" --source CI --email "${CHANGE_AUTHOR_EMAIL}" .ros/rootfs/fs/microsd/log/*/*.ulg'
+              sh'''#!/bin/bash -xe
+                    find . -type f -name "ros*.xml" | \
+                        while read f
+                            do mv "$f" "${f/.xml/-vtol_old_2.xml}"
+                        done
+                '''
               archiveArtifacts '**/*.ulg'
               archiveArtifacts '.ros/*/px4/**.xml'
               archiveArtifacts '.ros/log/**.log'
@@ -474,6 +498,12 @@ pipeline {
             }
             failure {
               sh './Tools/upload_log.py -q --description "ROS mission test vtol_old_3.txt: ${CHANGE_ID}" --feedback "${CHANGE_TITLE} - ${CHANGE_URL}" --source CI --email "${CHANGE_AUTHOR_EMAIL}" .ros/rootfs/fs/microsd/log/*/*.ulg'
+              sh'''#!/bin/bash -xe
+                    find . -type f -name "ros*.xml" | \
+                        while read f
+                            do mv "$f" "${f/.xml/-vtol_old_3.xml}"
+                        done
+                '''
               archiveArtifacts '**/*.ulg'
               archiveArtifacts '.ros/*/px4/**.xml'
               archiveArtifacts '.ros/log/**.log'
@@ -501,6 +531,12 @@ pipeline {
             }
             failure {
               sh './Tools/upload_log.py -q --description "ROS mission test multirotor_box.mission: ${CHANGE_ID}" --feedback "${CHANGE_TITLE} - ${CHANGE_URL}" --source CI --email "${CHANGE_AUTHOR_EMAIL}" .ros/rootfs/fs/microsd/log/*/*.ulg'
+              sh'''#!/bin/bash -xe
+                    find . -type f -name "ros*.xml" | \
+                        while read f
+                            do mv "$f" "${f/.xml/-multirotor_box.xml}"
+                        done
+                '''
               archiveArtifacts '**/*.ulg'
               archiveArtifacts '.ros/*/px4/**.xml'
               archiveArtifacts '.ros/log/**.log'