yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: add rostest to 'px4' and MAVROS in caktin and colcon builds

Browse Source
This commit is contained in:
TSC21
2018-12-12 20:07:05 +00:00
committed by Nuno Marques
parent 4ecb8746d6
commit b2fd8abf9e
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Jenkinsfile vendored
View File

@@ -19,11 +19,17 @@ pipeline {
echo $0; echo $0;
mkdir -p catkin_ws/src; mkdir -p catkin_ws/src;
cd catkin_ws; cd catkin_ws;
// ln -s Firmware/Tools/sitl_gazebo src/mavlink_sitl_gazebo;
source /opt/ros/melodic/setup.bash; source /opt/ros/melodic/setup.bash;
catkin init; catkin init;
source devel/setup.bash;
catkin build -j$(nproc) -l$(nproc); catkin build -j$(nproc) -l$(nproc);
''' '''
// test if the binary was correctly installed and runs using 'mavros_posix_silt.launch'
//sh '''#!/bin/bash -l
// echo $0;
// source catkin_ws/devel/setup.bash;
// rostest px4 pub_test.launch;
//'''
} }
post { post {
always { always {
@@ -49,6 +55,7 @@ pipeline {
unset ROS_DISTRO; unset ROS_DISTRO;
mkdir -p colcon_ws/src; mkdir -p colcon_ws/src;
cd colcon_ws; cd colcon_ws;
// ln -s Firmware/Tools/sitl_gazebo src/mavlink_sitl_gazebo;
source /opt/ros/bouncy/setup.sh; source /opt/ros/bouncy/setup.sh;
colcon build --event-handlers console_direct+ --symlink-install; colcon build --event-handlers console_direct+ --symlink-install;
''' '''

1
launch/posix_sitl.launch
View File

@@ -43,4 +43,3 @@
<!-- gazebo model --> <!-- gazebo model -->
<node name="$(anon vehicle_spawn)" pkg="gazebo_ros" type="spawn_model" output="screen" args="-sdf -file $(arg sdf) -model $(arg vehicle) -x $(arg x) -y $(arg y) -z $(arg z) -R $(arg R) -P $(arg P) -Y $(arg Y)"/> <node name="$(anon vehicle_spawn)" pkg="gazebo_ros" type="spawn_model" output="screen" args="-sdf -file $(arg sdf) -model $(arg vehicle) -x $(arg x) -y $(arg y) -z $(arg z) -R $(arg R) -P $(arg P) -Y $(arg Y)"/>
</launch> </launch>

1
launch/px4.launch
View File

@@ -16,4 +16,3 @@
<node name="sitl_$(arg ID)" pkg="px4" type="px4" output="screen" args="$(find px4)/ROMFS/px4fmu_common -s etc/init.d-posix/rcS -i $(arg ID) $(arg px4_command_arg1)"> <node name="sitl_$(arg ID)" pkg="px4" type="px4" output="screen" args="$(find px4)/ROMFS/px4fmu_common -s etc/init.d-posix/rcS -i $(arg ID) $(arg px4_command_arg1)">
</node> </node>
</launch> </launch>