From 4dbeeafd84a1a031c8c5bc68909d2437ebb1c130 Mon Sep 17 00:00:00 2001 From: floweisshardt Date: Sun, 31 Jan 2021 21:30:21 +0100 Subject: [PATCH 1/5] test manual execution --- .github/workflows/industrial_ci_action.yml | 4 ++-- atf_test/CMakeLists.txt | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml index 8b390705..6a994f88 100644 --- a/.github/workflows/industrial_ci_action.yml +++ b/.github/workflows/industrial_ci_action.yml @@ -12,7 +12,7 @@ jobs: timeout-minutes: 30 env: ADDITIONAL_DEBS: apt-utils git-core openssh-client openssh-server curl - AFTER_INIT: mkdir -p ~/.ssh && touch ~/.ssh/known_hosts && ssh-keyscan github.com >> ~/.ssh/known_hosts && git config --global url."https://token:${{secrets.GITHUBPAT}}@github.com/".insteadOf "https://github.com/" && curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && apt-get install git-lfs -y && cd $HOME && git lfs install && cd - + AFTER_INIT: mkdir -p ~/.ssh && touch ~/.ssh/known_hosts && ssh-keyscan github.com >> ~/.ssh/known_hosts && curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && apt-get install git-lfs -y && cd $HOME && git lfs install && cd - CATKIN_LINT: pedantic NOT_TEST_DOWNSTREAM: true PYLINT_ARGS: "--output-format=parseable --errors-only --ignored-modules=catkin_pkg.python_setup,lxml.etree,lxml.builder,matplotlib,numpy,progressbar,rospkg,six.moves.http_client,tf2_ros,yaml" @@ -27,7 +27,7 @@ jobs: env: - {ROS_DISTRO: kinetic} - {ROS_DISTRO: melodic} - - {ROS_DISTRO: noetic, BEFORE_RUN_TARGET_TEST: apt install -y python3-osrf-pycommon} # manual installation of osrf-pycomm is a workaround for https://github.com/catkin/catkin_tools/issues/594#issuecomment-688149976 + - {ROS_DISTRO: noetic, BEFORE_BUILD_TARGET_WORKSPACE: apt install -y python3-osrf-pycommon, BUILDER: catkin_tools} # manual installation of osrf-pycomm is a workaround for https://github.com/catkin/catkin_tools/issues/594#issuecomment-688149976 name: ${{matrix.env.ROS_DISTRO}} runs-on: ubuntu-latest steps: diff --git a/atf_test/CMakeLists.txt b/atf_test/CMakeLists.txt index f5351328..42ba45ca 100644 --- a/atf_test/CMakeLists.txt +++ b/atf_test/CMakeLists.txt @@ -22,13 +22,13 @@ install(DIRECTORY atf launch test ############# ## Testing ## ############# -#if(CATKIN_ENABLE_TESTING) -# find_package(rostest REQUIRED) -# add_rostest(test/manual_execution.test) -#endif() - if(CATKIN_ENABLE_TESTING) - find_package(atf_core REQUIRED) - atf_test(atf/test_generation_config.yaml) - atf_test(atf/test_generation_config_extended.yaml False) + find_package(atf_core rostest REQUIRED) + add_rostest(test/manual_execution.test) endif() + +#if(CATKIN_ENABLE_TESTING) +# find_package(atf_core REQUIRED) +# atf_test(atf/test_generation_config.yaml) +# atf_test(atf/test_generation_config_extended.yaml False) +#endif() From d728c3d2398f1d8971827ad7e893bf1c40c86eb5 Mon Sep 17 00:00:00 2001 From: floweisshardt Date: Sun, 31 Jan 2021 21:34:44 +0100 Subject: [PATCH 2/5] build depend on rostest --- atf_test/package.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/atf_test/package.xml b/atf_test/package.xml index 2485f6b8..be6a3513 100644 --- a/atf_test/package.xml +++ b/atf_test/package.xml @@ -12,6 +12,8 @@ catkin + rostest + atf_core atf_test_tools rospy @@ -19,6 +21,5 @@ tf2_ros atf_core - rostest From 57d5c0f34de044ea966717e30d73cb9cca5ee380 Mon Sep 17 00:00:00 2001 From: floweisshardt Date: Sun, 31 Jan 2021 21:38:28 +0100 Subject: [PATCH 3/5] build depend on rostest --- atf_test/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/atf_test/CMakeLists.txt b/atf_test/CMakeLists.txt index 42ba45ca..078116c0 100644 --- a/atf_test/CMakeLists.txt +++ b/atf_test/CMakeLists.txt @@ -23,7 +23,8 @@ install(DIRECTORY atf launch test ## Testing ## ############# if(CATKIN_ENABLE_TESTING) - find_package(atf_core rostest REQUIRED) + find_package(atf_core REQUIRED) + find_package(rostest REQUIRED) add_rostest(test/manual_execution.test) endif() From 62caadd272b945b39b6a88e2f130cd6fb321b273 Mon Sep 17 00:00:00 2001 From: floweisshardt Date: Sun, 31 Jan 2021 21:58:20 +0100 Subject: [PATCH 4/5] fix rostest dependency --- atf_test/CMakeLists.txt | 3 +-- atf_test/package.xml | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/atf_test/CMakeLists.txt b/atf_test/CMakeLists.txt index 078116c0..f8b8082c 100644 --- a/atf_test/CMakeLists.txt +++ b/atf_test/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.0.2) project(atf_test) -find_package(catkin REQUIRED) +find_package(catkin REQUIRED COMPONENTS rostest) catkin_package() @@ -24,7 +24,6 @@ install(DIRECTORY atf launch test ############# if(CATKIN_ENABLE_TESTING) find_package(atf_core REQUIRED) - find_package(rostest REQUIRED) add_rostest(test/manual_execution.test) endif() diff --git a/atf_test/package.xml b/atf_test/package.xml index be6a3513..96efbd12 100644 --- a/atf_test/package.xml +++ b/atf_test/package.xml @@ -12,7 +12,7 @@ catkin - rostest + rostest atf_core atf_test_tools @@ -21,5 +21,6 @@ tf2_ros atf_core + rostest From ebf7e4dde045523d91b410488be3d9d4a20b3f00 Mon Sep 17 00:00:00 2001 From: floweisshardt Date: Sun, 31 Jan 2021 22:14:58 +0100 Subject: [PATCH 5/5] BUILDER colcon --- .github/workflows/industrial_ci_action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml index 6a994f88..02d018ba 100644 --- a/.github/workflows/industrial_ci_action.yml +++ b/.github/workflows/industrial_ci_action.yml @@ -27,7 +27,7 @@ jobs: env: - {ROS_DISTRO: kinetic} - {ROS_DISTRO: melodic} - - {ROS_DISTRO: noetic, BEFORE_BUILD_TARGET_WORKSPACE: apt install -y python3-osrf-pycommon, BUILDER: catkin_tools} # manual installation of osrf-pycomm is a workaround for https://github.com/catkin/catkin_tools/issues/594#issuecomment-688149976 + - {ROS_DISTRO: noetic, BEFORE_BUILD_TARGET_WORKSPACE: apt install -y python3-osrf-pycommon} # manual installation of osrf-pycomm is a workaround for https://github.com/catkin/catkin_tools/issues/594#issuecomment-688149976 name: ${{matrix.env.ROS_DISTRO}} runs-on: ubuntu-latest steps: