From 6904b3e0fd5acf81f424c1c864595d125e324d22 Mon Sep 17 00:00:00 2001 From: David Conner Date: Fri, 23 Jun 2023 19:33:37 -0400 Subject: [PATCH] setup for pre-release testing of ROS 2 FlexBE --- ci_scripts/run_devel_tests.bash | 11 ++++++++++- ci_scripts/run_install_tests.bash | 1 + rosinstall/flexbe_app.rosinstall | 2 +- rosinstall/flexbe_behavior_engine.rosinstall | 2 +- rosinstall/generic_flexbe_states.rosinstall | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ci_scripts/run_devel_tests.bash b/ci_scripts/run_devel_tests.bash index 574a64d..6c3508e 100644 --- a/ci_scripts/run_devel_tests.bash +++ b/ci_scripts/run_devel_tests.bash @@ -1,4 +1,13 @@ #!/usr/bin/env bash set -e -echo "No devel tests with colcon" +echo "Verifying symlink install build ..." +source /opt/ros/$ROS_DISTRO/setup.bash +cd ~/colcon_ws +rm -rf install build log +colcon build --symlink-install +source ~/colcon_ws/install/setup.bash +ros2 run flexbe_app nwjs_install +xvfb-run ros2 run flexbe_app run_app --offline --run-tests +colcon test --ctest-args tests +colcon test-result --all diff --git a/ci_scripts/run_install_tests.bash b/ci_scripts/run_install_tests.bash index 36ff552..30f2fd6 100644 --- a/ci_scripts/run_install_tests.bash +++ b/ci_scripts/run_install_tests.bash @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -e +echo "Verifying regular install build ..." source /opt/ros/$ROS_DISTRO/setup.bash cd ~/colcon_ws rm -rf install build log diff --git a/rosinstall/flexbe_app.rosinstall b/rosinstall/flexbe_app.rosinstall index 4ff921c..402b891 100644 --- a/rosinstall/flexbe_app.rosinstall +++ b/rosinstall/flexbe_app.rosinstall @@ -1,4 +1,4 @@ - git: local-name: flexbe_app uri: https://github.com/FlexBE/flexbe_app.git - version: ros2-devel + version: ros2-pre-release diff --git a/rosinstall/flexbe_behavior_engine.rosinstall b/rosinstall/flexbe_behavior_engine.rosinstall index 9ff342e..de32963 100644 --- a/rosinstall/flexbe_behavior_engine.rosinstall +++ b/rosinstall/flexbe_behavior_engine.rosinstall @@ -1,4 +1,4 @@ - git: local-name: flexbe_behavior_engine uri: https://github.com/FlexBE/flexbe_behavior_engine.git - version: ros2-devel + version: ros2-pre-release diff --git a/rosinstall/generic_flexbe_states.rosinstall b/rosinstall/generic_flexbe_states.rosinstall index 54d19a7..a3213eb 100644 --- a/rosinstall/generic_flexbe_states.rosinstall +++ b/rosinstall/generic_flexbe_states.rosinstall @@ -1,4 +1,4 @@ - git: local-name: generic_flexbe_states uri: https://github.com/FlexBE/generic_flexbe_states.git - version: ros2-devel + version: ros2-pre-release