Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FAILS] Feature/manual test execution noetic #174

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[FAILS] Feature/manual test execution noetic #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4dbeeaf
test manual execution
floweisshardt Jan 31, 2021
d728c3d
build depend on rostest
floweisshardt Jan 31, 2021
57d5c0f
build depend on rostest
floweisshardt Jan 31, 2021
62caadd
fix rostest dependency
floweisshardt Jan 31, 2021
ebf7e4d
BUILDER colcon
floweisshardt Jan 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/industrial_ci_action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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} # 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:
Expand Down
16 changes: 8 additions & 8 deletions atf_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()

Expand All @@ -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)
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()
2 changes: 2 additions & 0 deletions atf_test/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

<buildtool_depend>catkin</buildtool_depend>

<exec_depend>rostest</exec_depend>

<exec_depend>atf_core</exec_depend>
<exec_depend>atf_test_tools</exec_depend>
<exec_depend>rospy</exec_depend>
Expand Down