From f6aa29a10fa8ae30b96d644762fcc83b54f545dc Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Wed, 3 Jun 2020 21:07:34 -0400 Subject: [PATCH] Jenkins: SITL temporarily disable failing offboard tests --- .ci/Jenkinsfile-SITL_tests | 27 +++++++--------- .ci/Jenkinsfile-SITL_tests_ASan | 27 +++++++--------- .ci/Jenkinsfile-SITL_tests_coverage | 49 ++++++++++++++++++----------- 3 files changed, 54 insertions(+), 49 deletions(-) diff --git a/.ci/Jenkinsfile-SITL_tests b/.ci/Jenkinsfile-SITL_tests index 2ae7022e90..a0ee091e8e 100644 --- a/.ci/Jenkinsfile-SITL_tests +++ b/.ci/Jenkinsfile-SITL_tests @@ -41,39 +41,36 @@ pipeline { mission: "FW_mission_1", vehicle: "plane" ], - [ name: "MC_box", test: "mavros_posix_test_mission.test", mission: "MC_mission_box", vehicle: "iris" ], - [ - name: "MC_offboard_att", - test: "mavros_posix_tests_offboard_attctl.test", - mission: "", - vehicle: "iris" - ], + // [ + // name: "MC_offboard_att", + // test: "mavros_posix_tests_offboard_attctl.test", + // mission: "", + // vehicle: "iris" + // ], [ name: "MC_offboard_pos", test: "mavros_posix_tests_offboard_posctl.test", mission: "", vehicle: "iris" ], - [ - name: "MC_offboard_rpyrt", - test: "mavros_posix_tests_offboard_rpyrt_ctl.test", - mission: "", - vehicle: "iris" - ], - + // [ + // name: "MC_offboard_rpyrt", + // test: "mavros_posix_tests_offboard_rpyrt_ctl.test", + // mission: "", + // vehicle: "iris" + // ], [ name: "Rover 1", test: "mavros_posix_test_mission.test", mission: "rover_mission_1", vehicle: "rover" ], - [ name: "VTOL_standard", test: "mavros_posix_test_mission.test", diff --git a/.ci/Jenkinsfile-SITL_tests_ASan b/.ci/Jenkinsfile-SITL_tests_ASan index 8dc8b733b3..49227683c9 100644 --- a/.ci/Jenkinsfile-SITL_tests_ASan +++ b/.ci/Jenkinsfile-SITL_tests_ASan @@ -41,39 +41,36 @@ pipeline { mission: "FW_mission_1", vehicle: "plane" ], - [ name: "MC_box", test: "mavros_posix_test_mission.test", mission: "MC_mission_box", vehicle: "iris" ], - [ - name: "MC_offboard_att", - test: "mavros_posix_tests_offboard_attctl.test", - mission: "", - vehicle: "iris" - ], + // [ + // name: "MC_offboard_att", + // test: "mavros_posix_tests_offboard_attctl.test", + // mission: "", + // vehicle: "iris" + // ], [ name: "MC_offboard_pos", test: "mavros_posix_tests_offboard_posctl.test", mission: "", vehicle: "iris" ], - [ - name: "MC_offboard_rpyrt", - test: "mavros_posix_tests_offboard_rpyrt_ctl.test", - mission: "", - vehicle: "iris" - ], - + // [ + // name: "MC_offboard_rpyrt", + // test: "mavros_posix_tests_offboard_rpyrt_ctl.test", + // mission: "", + // vehicle: "iris" + // ], [ name: "Rover 1", test: "mavros_posix_test_mission.test", mission: "rover_mission_1", vehicle: "rover" ], - [ name: "VTOL_standard", test: "mavros_posix_test_mission.test", diff --git a/.ci/Jenkinsfile-SITL_tests_coverage b/.ci/Jenkinsfile-SITL_tests_coverage index e22ab1d3d8..bf9d007fb4 100644 --- a/.ci/Jenkinsfile-SITL_tests_coverage +++ b/.ci/Jenkinsfile-SITL_tests_coverage @@ -15,39 +15,36 @@ pipeline { mission: "FW_mission_1", vehicle: "plane" ], - [ name: "MC_box", test: "mavros_posix_test_mission.test", mission: "MC_mission_box", vehicle: "iris" ], - [ - name: "MC_offboard_att", - test: "mavros_posix_tests_offboard_attctl.test", - mission: "", - vehicle: "iris" - ], + // [ + // name: "MC_offboard_att", + // test: "mavros_posix_tests_offboard_attctl.test", + // mission: "", + // vehicle: "iris" + // ], [ name: "MC_offboard_pos", test: "mavros_posix_tests_offboard_posctl.test", mission: "", vehicle: "iris" ], - [ - name: "MC_offboard_rpyrt", - test: "mavros_posix_tests_offboard_rpyrt_ctl.test", - mission: "", - vehicle: "iris" - ], - + // [ + // name: "MC_offboard_rpyrt", + // test: "mavros_posix_tests_offboard_rpyrt_ctl.test", + // mission: "", + // vehicle: "iris" + // ], [ name: "Rover 1", test: "mavros_posix_test_mission.test", mission: "rover_mission_1", vehicle: "rover" ], - [ name: "VTOL_standard", test: "mavros_posix_test_mission.test", @@ -60,11 +57,25 @@ pipeline { mission: "VTOL_mission_1", vehicle: "tailsitter" ], + [ + name: "VTOL_tiltrotor", + test: "mavros_posix_test_mission.test", + mission: "VTOL_mission_1", + vehicle: "tiltrotor" + ], // [ - // name: "VTOL_tiltrotor", - // test: "mavros_posix_test_mission.test", - // mission: "VTOL_mission_1", - // vehicle: "tiltrotor" + // name: "MC_avoidance", + // test: "mavros_posix_test_avoidance.test", + // mission: "avoidance", + // vehicle: "iris_obs_avoid", + // run_script: "rostest_avoidance_run.sh" + // ], + // [ + // name: "MC_safe_landing", + // test: "mavros_posix_test_safe_landing.test", + // mission: "MC_safe_landing", + // vehicle: "iris_obs_avoid", + // run_script: "rostest_avoidance_run.sh" // ], ]