From a9fc04b2f9ebc0cd48888c62a9c4fdd9beb77504 Mon Sep 17 00:00:00 2001 From: Anthony Lamping Date: Sat, 9 Mar 2019 07:24:40 -0500 Subject: [PATCH] CI: SITL test run: select ROS version based on env variable --- test/rostest_px4_run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/rostest_px4_run.sh b/test/rostest_px4_run.sh index ea638f70b7..9f7a4f8141 100755 --- a/test/rostest_px4_run.sh +++ b/test/rostest_px4_run.sh @@ -3,7 +3,7 @@ DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) PX4_SRC_DIR=${DIR}/.. -source /opt/ros/kinetic/setup.bash +source /opt/ros/${ROS_DISTRO:-kinetic}/setup.bash source ${PX4_SRC_DIR}/Tools/setup_gazebo.bash ${PX4_SRC_DIR} ${PX4_SRC_DIR}/build/px4_sitl_default export ROS_PACKAGE_PATH=$ROS_PACKAGE_PATH:${PX4_SRC_DIR}:${PX4_SRC_DIR}/Tools/sitl_gazebo