From 1ef7b351be32651f293806600432678eefaa9499 Mon Sep 17 00:00:00 2001
From: Anthony Lamping <lamping.ap@gmail.com>
Date: Thu, 1 Mar 2018 11:56:21 -0500
Subject: [PATCH] CI: assmue plan file format

---
 Jenkinsfile                           | 96 +++++++++------------------
 test/mavros_posix_test_mission.test   |  2 +-
 test/mavros_posix_tests_missions.test | 12 ++--
 3 files changed, 37 insertions(+), 73 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bfb544d96f..6df599395d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -352,7 +352,7 @@ pipeline {
             sh 'git fetch --tags'
             sh 'make posix_sitl_default'
             sh 'make posix_sitl_default sitl_gazebo'
-            sh './test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_new_1.plan vehicle:=standard_vtol'
+            sh './test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_new_1 vehicle:=standard_vtol'
           }
           post {
             success {
@@ -360,15 +360,9 @@ pipeline {
             }
             failure {
               sh './Tools/upload_log.py -q --description "ROS mission test vtol_new_1: ${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'
+              archiveArtifacts '.ros/**/*.ulg'
+              archiveArtifacts '.ros/**/rosunit-*.xml'
+              archiveArtifacts '.ros/**/rostest-*.log'
             }
           }
         }
@@ -386,7 +380,7 @@ pipeline {
             sh 'git fetch --tags'
             sh 'make posix_sitl_default'
             sh 'make posix_sitl_default sitl_gazebo'
-            sh './test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_new_2.plan vehicle:=standard_vtol'
+            sh './test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_new_2 vehicle:=standard_vtol'
           }
           post {
             success {
@@ -394,15 +388,9 @@ pipeline {
             }
             failure {
               sh './Tools/upload_log.py -q --description "ROS mission test vtol_new_2: ${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'
+              archiveArtifacts '.ros/**/*.ulg'
+              archiveArtifacts '.ros/**/rosunit-*.xml'
+              archiveArtifacts '.ros/**/rostest-*.log'
             }
           }
         }
@@ -420,7 +408,7 @@ pipeline {
             sh 'git fetch --tags'
             sh 'make posix_sitl_default'
             sh 'make posix_sitl_default sitl_gazebo'
-            sh './test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_old_1.plan vehicle:=standard_vtol'
+            sh './test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_old_1 vehicle:=standard_vtol'
           }
           post {
             success {
@@ -428,15 +416,9 @@ pipeline {
             }
             failure {
               sh './Tools/upload_log.py -q --description "ROS mission test vtol_old_1: ${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'
+              archiveArtifacts '.ros/**/*.ulg'
+              archiveArtifacts '.ros/**/rosunit-*.xml'
+              archiveArtifacts '.ros/**/rostest-*.log'
             }
           }
         }
@@ -454,7 +436,7 @@ pipeline {
             sh 'git fetch --tags'
             sh 'make posix_sitl_default'
             sh 'make posix_sitl_default sitl_gazebo'
-            sh './test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_old_2.plan vehicle:=standard_vtol'
+            sh './test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_old_2 vehicle:=standard_vtol'
           }
           post {
             success {
@@ -462,15 +444,9 @@ pipeline {
             }
             failure {
               sh './Tools/upload_log.py -q --description "ROS mission test vtol_old_2: ${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'
+              archiveArtifacts '.ros/**/*.ulg'
+              archiveArtifacts '.ros/**/rosunit-*.xml'
+              archiveArtifacts '.ros/**/rostest-*.log'
             }
           }
         }
@@ -488,7 +464,7 @@ pipeline {
             //sh 'git fetch --tags'
             //sh 'make posix_sitl_default'
             //sh 'make posix_sitl_default sitl_gazebo'
-            //sh './test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_old_3.plan vehicle:=standard_vtol'
+            //sh './test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_old_3 vehicle:=standard_vtol'
           }
           post {
             //success {
@@ -496,15 +472,9 @@ pipeline {
             //}
             failure {
               //sh './Tools/upload_log.py -q --description "ROS mission test vtol_old_3: ${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'
+              archiveArtifacts '.ros/**/*.ulg'
+              archiveArtifacts '.ros/**/rosunit-*.xml'
+              archiveArtifacts '.ros/**/rostest-*.log'
             }
           }
         }
@@ -522,7 +492,7 @@ pipeline {
             sh 'git fetch --tags'
             sh 'make posix_sitl_default'
             sh 'make posix_sitl_default sitl_gazebo'
-            sh './test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=multirotor_box.plan vehicle:=iris'
+            sh './test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=multirotor_box vehicle:=iris'
           }
           post {
             success {
@@ -530,15 +500,9 @@ pipeline {
             }
             failure {
               sh './Tools/upload_log.py -q --description "ROS mission test multirotor_box: ${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'
+              archiveArtifacts '.ros/**/*.ulg'
+              archiveArtifacts '.ros/**/rosunit-*.xml'
+              archiveArtifacts '.ros/**/rostest-*.log'
             }
           }
         }
@@ -564,9 +528,9 @@ pipeline {
             }
             failure {
               sh './Tools/upload_log.py -q --description "ROS offboard attitude test: ${CHANGE_ID}" --feedback "${CHANGE_TITLE} - ${CHANGE_URL}" --source CI --email "${CHANGE_AUTHOR_EMAIL}" .ros/rootfs/fs/microsd/log/*/*.ulg'
-              archiveArtifacts '**/*.ulg'
-              archiveArtifacts '.ros/*/px4/**.xml'
-              archiveArtifacts '.ros/log/**.log'
+              archiveArtifacts '.ros/**/*.ulg'
+              archiveArtifacts '.ros/**/rosunit-*.xml'
+              archiveArtifacts '.ros/**/rostest-*.log'
             }
           }
         }
@@ -592,9 +556,9 @@ pipeline {
             }
             failure {
               sh './Tools/upload_log.py -q --description "ROS offboard position test: ${CHANGE_ID}" --feedback "${CHANGE_TITLE} - ${CHANGE_URL}" --source CI --email "${CHANGE_AUTHOR_EMAIL}" .ros/rootfs/fs/microsd/log/*/*.ulg'
-              archiveArtifacts '**/*.ulg'
-              archiveArtifacts '.ros/*/px4/**.xml'
-              archiveArtifacts '.ros/log/**.log'
+              archiveArtifacts '.ros/**/*.ulg'
+              archiveArtifacts '.ros/**/rosunit-*.xml'
+              archiveArtifacts '.ros/**/rostest-*.log'
             }
           }
         }
diff --git a/test/mavros_posix_test_mission.test b/test/mavros_posix_test_mission.test
index 06b92aa14a..10c85364e4 100644
--- a/test/mavros_posix_test_mission.test
+++ b/test/mavros_posix_test_mission.test
@@ -15,5 +15,5 @@
         <arg name="respawn_gazebo" value="$(arg respawn_gazebo)"/>
     </include>
     <!-- ROStest -->
-    <test test-name="mission_test" pkg="px4" type="mission_test.py" time-limit="300.0" args="$(arg mission)"/>
+    <test test-name="$(arg mission)" pkg="px4" type="mission_test.py" time-limit="300.0" args="$(arg mission).plan"/>
 </launch>
diff --git a/test/mavros_posix_tests_missions.test b/test/mavros_posix_tests_missions.test
index 88d0b3c42f..8d6ab6b303 100644
--- a/test/mavros_posix_tests_missions.test
+++ b/test/mavros_posix_tests_missions.test
@@ -13,10 +13,10 @@
         <arg name="respawn_gazebo" value="$(arg respawn_gazebo)"/>
     </include>
     <!-- ROStest -->
-    <test test-name="multicopter_box" pkg="px4" type="mission_test.py" time-limit="120.0" args="multirotor_box.mission"/>
-    <test test-name="mission_test_new_1" pkg="px4" type="mission_test.py" time-limit="300.0" args="vtol_new_1.txt"/>
-    <test test-name="mission_test_new_2" pkg="px4" type="mission_test.py" time-limit="300.0" args="vtol_new_2.txt"/>
-    <test test-name="mission_test_old_1" pkg="px4" type="mission_test.py" time-limit="300.0" args="vtol_old_1.txt"/>
-    <test test-name="mission_test_old_2" pkg="px4" type="mission_test.py" time-limit="300.0" args="vtol_old_2.txt"/>
-    <test test-name="mission_test_old_3" pkg="px4" type="mission_test.py" time-limit="300.0" args="vtol_old_3.txt"/>
+    <test test-name="multicopter_box" pkg="px4" type="mission_test.py" time-limit="120.0" args="multirotor_box.plan"/>
+    <test test-name="mission_test_new_1" pkg="px4" type="mission_test.py" time-limit="300.0" args="vtol_new_1.plan"/>
+    <test test-name="mission_test_new_2" pkg="px4" type="mission_test.py" time-limit="300.0" args="vtol_new_2.plan"/>
+    <test test-name="mission_test_old_1" pkg="px4" type="mission_test.py" time-limit="300.0" args="vtol_old_1.plan"/>
+    <test test-name="mission_test_old_2" pkg="px4" type="mission_test.py" time-limit="300.0" args="vtol_old_2.plan"/>
+    <test test-name="mission_test_old_3" pkg="px4" type="mission_test.py" time-limit="300.0" args="vtol_old_3.plan"/>
 </launch>