zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

CI: assmue plan file format

sbg
Anthony Lamping 7 years ago committed by Daniel Agar
parent
3be6a439f1
commit
1ef7b351be
3 changed files with 37 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 96
      Jenkinsfile
  2. 2
      test/mavros_posix_test_mission.test
  3. 12
      test/mavros_posix_tests_missions.test

96
Jenkinsfile vendored
Unescape View File

@ -352,7 +352,7 @@ pipeline {
sh 'git fetch --tags' sh 'git fetch --tags'
sh 'make posix_sitl_default' sh 'make posix_sitl_default'
sh 'make posix_sitl_default sitl_gazebo' 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 { post {
success { success {
@ -360,15 +360,9 @@ pipeline {
} }
failure { 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 './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 archiveArtifacts '.ros/**/*.ulg'
find . -type f -name "ros*.xml" | \ archiveArtifacts '.ros/**/rosunit-*.xml'
while read f archiveArtifacts '.ros/**/rostest-*.log'
do mv "$f" "${f/.xml/-vtol_new_1.xml}"
done
'''
archiveArtifacts '**/*.ulg'
archiveArtifacts '.ros/*/px4/**.xml'
archiveArtifacts '.ros/log/**.log'
} }
} }
} }
@ -386,7 +380,7 @@ pipeline {
sh 'git fetch --tags' sh 'git fetch --tags'
sh 'make posix_sitl_default' sh 'make posix_sitl_default'
sh 'make posix_sitl_default sitl_gazebo' 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 { post {
success { success {
@ -394,15 +388,9 @@ pipeline {
} }
failure { 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 './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 archiveArtifacts '.ros/**/*.ulg'
find . -type f -name "ros*.xml" | \ archiveArtifacts '.ros/**/rosunit-*.xml'
while read f archiveArtifacts '.ros/**/rostest-*.log'
do mv "$f" "${f/.xml/-vtol_new_2.xml}"
done
'''
archiveArtifacts '**/*.ulg'
archiveArtifacts '.ros/*/px4/**.xml'
archiveArtifacts '.ros/log/**.log'
} }
} }
} }
@ -420,7 +408,7 @@ pipeline {
sh 'git fetch --tags' sh 'git fetch --tags'
sh 'make posix_sitl_default' sh 'make posix_sitl_default'
sh 'make posix_sitl_default sitl_gazebo' 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 { post {
success { success {
@ -428,15 +416,9 @@ pipeline {
} }
failure { 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 './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 archiveArtifacts '.ros/**/*.ulg'
find . -type f -name "ros*.xml" | \ archiveArtifacts '.ros/**/rosunit-*.xml'
while read f archiveArtifacts '.ros/**/rostest-*.log'
do mv "$f" "${f/.xml/-vtol_old_1.xml}"
done
'''
archiveArtifacts '**/*.ulg'
archiveArtifacts '.ros/*/px4/**.xml'
archiveArtifacts '.ros/log/**.log'
} }
} }
} }
@ -454,7 +436,7 @@ pipeline {
sh 'git fetch --tags' sh 'git fetch --tags'
sh 'make posix_sitl_default' sh 'make posix_sitl_default'
sh 'make posix_sitl_default sitl_gazebo' 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 { post {
success { success {
@ -462,15 +444,9 @@ pipeline {
} }
failure { 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 './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 archiveArtifacts '.ros/**/*.ulg'
find . -type f -name "ros*.xml" | \ archiveArtifacts '.ros/**/rosunit-*.xml'
while read f archiveArtifacts '.ros/**/rostest-*.log'
do mv "$f" "${f/.xml/-vtol_old_2.xml}"
done
'''
archiveArtifacts '**/*.ulg'
archiveArtifacts '.ros/*/px4/**.xml'
archiveArtifacts '.ros/log/**.log'
} }
} }
} }
@ -488,7 +464,7 @@ pipeline {
//sh 'git fetch --tags' //sh 'git fetch --tags'
//sh 'make posix_sitl_default' //sh 'make posix_sitl_default'
//sh 'make posix_sitl_default sitl_gazebo' //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 { post {
//success { //success {
@ -496,15 +472,9 @@ pipeline {
//} //}
failure { 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 './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 archiveArtifacts '.ros/**/*.ulg'
find . -type f -name "ros*.xml" | \ archiveArtifacts '.ros/**/rosunit-*.xml'
while read f archiveArtifacts '.ros/**/rostest-*.log'
do mv "$f" "${f/.xml/-vtol_old_3.xml}"
done
'''
archiveArtifacts '**/*.ulg'
archiveArtifacts '.ros/*/px4/**.xml'
archiveArtifacts '.ros/log/**.log'
} }
} }
} }
@ -522,7 +492,7 @@ pipeline {
sh 'git fetch --tags' sh 'git fetch --tags'
sh 'make posix_sitl_default' sh 'make posix_sitl_default'
sh 'make posix_sitl_default sitl_gazebo' 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 { post {
success { success {
@ -530,15 +500,9 @@ pipeline {
} }
failure { 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 './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 archiveArtifacts '.ros/**/*.ulg'
find . -type f -name "ros*.xml" | \ archiveArtifacts '.ros/**/rosunit-*.xml'
while read f archiveArtifacts '.ros/**/rostest-*.log'
do mv "$f" "${f/.xml/-multirotor_box.xml}"
done
'''
archiveArtifacts '**/*.ulg'
archiveArtifacts '.ros/*/px4/**.xml'
archiveArtifacts '.ros/log/**.log'
} }
} }
} }
@ -564,9 +528,9 @@ pipeline {
} }
failure { 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' 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/**/*.ulg'
archiveArtifacts '.ros/*/px4/**.xml' archiveArtifacts '.ros/**/rosunit-*.xml'
archiveArtifacts '.ros/log/**.log' archiveArtifacts '.ros/**/rostest-*.log'
} }
} }
} }
@ -592,9 +556,9 @@ pipeline {
} }
failure { 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' 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/**/*.ulg'
archiveArtifacts '.ros/*/px4/**.xml' archiveArtifacts '.ros/**/rosunit-*.xml'
archiveArtifacts '.ros/log/**.log' archiveArtifacts '.ros/**/rostest-*.log'
} }
} }
} }

2
test/mavros_posix_test_mission.test
Unescape View File

@ -15,5 +15,5 @@
<arg name="respawn_gazebo" value="$(arg respawn_gazebo)"/> <arg name="respawn_gazebo" value="$(arg respawn_gazebo)"/>
</include> </include>
<!-- ROStest --> <!-- 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> </launch>

12
test/mavros_posix_tests_missions.test
Unescape View File

@ -13,10 +13,10 @@
<arg name="respawn_gazebo" value="$(arg respawn_gazebo)"/> <arg name="respawn_gazebo" value="$(arg respawn_gazebo)"/>
</include> </include>
<!-- ROStest --> <!-- ROStest -->
<test test-name="multicopter_box" pkg="px4" type="mission_test.py" time-limit="120.0" args="multirotor_box.mission"/> <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.txt"/> <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.txt"/> <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.txt"/> <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.txt"/> <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.txt"/> <test test-name="mission_test_old_3" pkg="px4" type="mission_test.py" time-limit="300.0" args="vtol_old_3.plan"/>
</launch> </launch>

Write Preview
Loading…
Cancel
Save