@@ -80,12 +80,26 @@ pipeline {
80
80
mission : " VTOL_mission_1" ,
81
81
vehicle : " tailsitter"
82
82
],
83
- // [
84
- // name: "VTOL_tiltrotor",
85
- // test: "mavros_posix_test_mission.test",
86
- // mission: "VTOL_mission_1",
87
- // vehicle: "tiltrotor"
88
- // ],
83
+ [
84
+ name : " VTOL_tiltrotor" ,
85
+ test : " mavros_posix_test_mission.test" ,
86
+ mission : " VTOL_mission_1" ,
87
+ vehicle : " tiltrotor"
88
+ ],
89
+ [
90
+ name : " MC_avoidance" ,
91
+ test : " mavros_posix_test_avoidance.test" ,
92
+ mission : " avoidance" ,
93
+ vehicle : " iris_obs_avoid" ,
94
+ run_script : " rostest_avoidance_run.sh"
95
+ ],
96
+ [
97
+ name : " MC_safe_landing" ,
98
+ test : " mavros_posix_test_safe_landing.test" ,
99
+ mission : " MC_safe_landing" ,
100
+ vehicle : " iris_obs_avoid" ,
101
+ run_script : " rostest_avoidance_run.sh"
102
+ ],
89
103
90
104
]
91
105
@@ -119,6 +133,7 @@ def createTestNode(Map test_def) {
119
133
cleanWs()
120
134
docker. image(" px4io/px4-dev-ros-kinetic:2019-10-04" ). inside(' -e HOME=${WORKSPACE}' ) {
121
135
stage(test_def. name) {
136
+ def run_script = test_def. get(' run_script' , ' rostest_px4_run.sh' )
122
137
def test_ok = true
123
138
sh(' export' )
124
139
@@ -127,7 +142,7 @@ def createTestNode(Map test_def) {
127
142
128
143
// run test
129
144
try {
130
- sh(' px4-px4_sitl_default*/px4/test/rostest_px4_run.sh ' + test_def. test + ' mission:=' + test_def. mission + ' vehicle:=' + test_def. vehicle)
145
+ sh(' px4-px4_sitl_default*/px4/test/' + run_script + ' ' + test_def. test + ' mission:=' + test_def. mission + ' vehicle:=' + test_def. vehicle)
131
146
132
147
} catch (exc) {
133
148
// save all test artifacts for debugging
0 commit comments