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.

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

Noetic support #2767

Merged
merged 47 commits into from
Aug 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
0bb9a35
add python3 check for noetic
knorth55 Jun 26, 2021
15a9dac
add noetic travis test
knorth55 Jun 26, 2021
84b08da
add .travis.rosinstall.noetic
knorth55 Jun 26, 2021
6975ab0
fix for python3
knorth55 Jun 26, 2021
3b58556
add hook for noetic
knorth55 Jun 26, 2021
5aa2498
update Dockerfile
knorth55 Jun 26, 2021
0631a29
fix test-move-arm-to-bin.l error
knorth55 Jun 26, 2021
044f629
add python3 keys
knorth55 Jun 26, 2021
d826dff
set python version 3 in noetic
knorth55 Jun 26, 2021
99bbaea
add python3 check github actions
knorth55 Jun 30, 2021
4f3ec1c
add noetic github actions
knorth55 Jun 30, 2021
0a3b3d6
fix print syntax for python3
knorth55 Jun 30, 2021
c49079e
use pip3 for noetic
knorth55 Jun 30, 2021
5df0cbe
update noetic ci config
knorth55 Apr 7, 2022
345551d
use pazeshun dynamixel_motor for noetic ci
knorth55 Apr 7, 2022
40a8ab3
add noetic travis rosinstall
knorth55 Apr 8, 2022
d7e0da7
skip roseus mongo install
knorth55 Apr 8, 2022
7008fc2
fix permission issue
knorth55 May 1, 2022
48d6af6
add sudo for permission denied
knorth55 May 1, 2022
6665df2
use latest catkin_virtualenv
knorth55 May 1, 2022
81af084
check submodules
knorth55 May 1, 2022
6dc3f4f
add jsk_pr2eus in .travis.rosinstall.noetic
knorth55 May 1, 2022
f6a0650
dont install data while build
knorth55 Apr 8, 2023
50d0c84
install python for noetic
knorth55 Apr 8, 2023
1d8d8c7
comment out download data script
knorth55 Apr 8, 2023
9c5abb9
use python3 for noetic
knorth55 Apr 8, 2023
ec8b17c
remove perse status
knorth55 Apr 8, 2023
a0bd39e
install in python3
knorth55 Apr 8, 2023
272009a
[CI] Apply 95e241a2fb4297fbc33e46382de579a378b075d2 to noetic
pazeshun Aug 16, 2023
4b893dc
[CI] Temporarily skip rosdep install of unreleased packages on noetic
pazeshun Aug 17, 2023
08cb326
[CI] Change packages to ones compilable on noetic
pazeshun Aug 17, 2023
807f9ea
[CI] Install packages unreleased on noetic from source
pazeshun Aug 17, 2023
aa15139
[CI] collada_urdf released on noetic is broken
pazeshun Aug 17, 2023
792e603
[CI] Use Python3-compatible jsk_visualization
pazeshun Aug 17, 2023
7a9ea00
xacro.py is removed on noetic
pazeshun Aug 17, 2023
df165a8
Make code (test code at least) compatible to Python3
pazeshun Aug 17, 2023
0935b64
Fix for noetic linter
pazeshun Aug 17, 2023
d97d0ff
[CI] Use apt-version scipy and skimage which are compatible with apt-…
pazeshun Aug 18, 2023
f77b2f9
[CI] Delete unnecessary skip keys of rosdep install
pazeshun Aug 18, 2023
b43af06
[CI] Install gdown with sudo to make gdown command callable
pazeshun Aug 18, 2023
690d0fa
[CI] Make BEFORE_SCRIPT of noetic travis the same as github actions
pazeshun Aug 18, 2023
8f3bbd9
[docker] Avoid ROS GPG key error
pazeshun Aug 21, 2023
dd253f1
[docker] DOCKER_TAG cannot be used in pull request build
pazeshun Aug 21, 2023
265b439
[docker] Use snapshot of rosdep list on indigo and kinetic
pazeshun Aug 21, 2023
e29a30c
[CI] Python2-compatible protobuf should be 3.17.3
pazeshun Aug 22, 2023
c3c19e5
[CI] Make BEFORE_SCRIPT of all travis tests the same as github actions
pazeshun Aug 22, 2023
4f106ff
[docker] Install python2-compatible packages before rosdep install
pazeshun Aug 22, 2023
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
53 changes: 53 additions & 0 deletions .github/workflows/noetic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# jsk_travis
on: [push, pull_request]

jobs:
noetic:
runs-on: ubuntu-latest
name: noetic

container: jskrobotics/ros-ubuntu:20.04

steps:
- name: Install latest git (use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkout .travis submodules
run: sudo apt-get update && sudo apt-get install -y software-properties-common && sudo apt-get update && sudo add-apt-repository -y ppa:git-core/ppa && sudo apt-get update && sudo apt-get install -y git
- name: work around permission issue # https://github.com/actions/checkout/issues/760#issuecomment-1097501613
run: |
set -x
export USER=$(whoami)
sudo mkdir -p /__w/
sudo chmod 777 -R /__w/
sudo chown -R $USER $HOME
git config --global --add safe.directory $GITHUB_WORKSPACE || echo "OK" # Show 'could not lock config file /github/home/.gitconfig: Permission denied', but it is ok
- name: Checkout
uses: actions/checkout@v3.0.2
with:
submodules: true
# github actions cache does not work because of permission denied.
# see: https://github.com/actions/cache/issues/404
# - name: Cache several data
# uses: actions/cache@v2
# with:
# path: |
# ~/.ccache
# ~/.cache/pip
# ~/apt-cacher-ng
# ~/.ros/data
# key: ${{ github.workflow }}
- name: work around permission issue again
run: |
set -x
grep path $GITHUB_WORKSPACE/.gitmodules | sed 's/.*=//' | xargs -n 1 -I '{}' git config --global --add safe.directory $GITHUB_WORKSPACE/'{}'
- name: Run jsk_travis
uses: jsk-ros-pkg/jsk_travis@master
with:
ROS_DISTRO : noetic
ROS_PARALLEL_JOBS: "-j8"
USE_DEB: false
NOT_TEST_INSTALL: true
ROSDEP_ADDITIONAL_OPTIONS: "-n -q --ignore-src --skip-keys=jsk_smart_gui --skip-keys=ros3djs --skip-keys=pr2_calibration_launch --skip-keys=jsk_android_gui_api9 --skip-keys=ros2djs --skip-keys=face_recognition --skip-keys=roslibjs --skip-keys=force_proximity_ros --skip-keys=safe_teleop_base --skip-keys=pcl --skip-keys=roseus_mongo --skip-keys=pr2_moveit_config --skip-keys=pr2_moveit_plugins --skip-keys=jsk_pr2_startup"
# XXX: hotfix for chainer problem (https://github.com/chainer/chainer/issues/8545)
# Use apt-version scipy and skimage which are compatible with apt-version numpy
BEFORE_SCRIPT: "sudo apt-get install -y -q python3-scipy python3-skimage; sudo -H pip3 install fcn chainercv chainer==6.7.0 gdown==4.4.0"
CATKIN_TOOLS_CONFIG_OPTIONS: "--blacklist imagesift jsk_recognition_msgs jsk_perception jsk_pcl_ros_utils jsk_pcl_ros resized_image_transport checkerboard_detector fetcheus naoqieus jsk_fetch_startup jsk_nao_startup roseus_remote jsk_robot_startup jsk_robot_utils jsk_pr2_calibration pr2_base_trajectory_action jsk_baxter_web peppereus naoeus jsk_baxter_desktop jsk_pepper_startup jsk_pr2_startup jsk_pr2_desktop"
TEST_PKGS: "jsk_apc2015_common jsk_apc2016_common jsk_arc2017_common jsk_2015_05_baxter_apc jsk_2016_01_baxter_apc jsk_arc2017_baxter sphand_driver baxtergv6_apc2016"
17 changes: 17 additions & 0 deletions .github/workflows/python3.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# jsk_travis
on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-latest
name: check_python3

container: ubuntu:20.04

steps:
- name: Chcekout
uses: actions/checkout@v2
- name: Check Python3
run: |
apt update -q && apt install -y -q python3
python3 -m compileall .
100 changes: 100 additions & 0 deletions .travis.rosinstall.noetic
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
# not released yet in noetic
- git:
local-name: RethinkRobotics/baxter_simulator
# https://github.com/RethinkRobotics/baxter_simulator/pull/132
uri: https://github.com/k-okada/baxter_simulator.git
version: fix_noetic
- tar:
local-name: baxter_examples
uri: https://github.com/RethinkRobotics-release/baxter_examples-release/archive/release/indigo/baxter_examples/1.2.0-0.tar.gz
version: baxter_examples-release-release-indigo-baxter_examples-1.2.0-0
- tar:
local-name: baxter_tools
uri: https://github.com/RethinkRobotics-release/baxter_tools-release/archive/release/indigo/baxter_tools/1.2.0-0.tar.gz
version: baxter_tools-release-release-indigo-baxter_tools-1.2.0-0
- tar:
local-name: jsk_planning/pddl_planner
uri: https://github.com/tork-a/jsk_planning-release/archive/release/melodic/pddl_planner/0.1.12-1.tar.gz
version: jsk_planning-release-release-melodic-pddl_planner-0.1.12-1
- tar:
local-name: jsk_planning/pddl_msgs
uri: https://github.com/tork-a/jsk_planning-release/archive/release/melodic/pddl_msgs/0.1.12-1.tar.gz
version: jsk_planning-release-release-melodic-pddl_msgs-0.1.12-1
- tar:
local-name: jsk_demos/jsk_demo_common
uri: https://github.com/tork-a/jsk_demos-release/archive/release/indigo/jsk_demo_common/0.0.4-0.tar.gz
version: jsk_demos-release-release-indigo-jsk_demo_common-0.0.4-0
- tar:
local-name: jsk_demos/jsk_maps
uri: https://github.com/tork-a/jsk_demos-release/archive/release/indigo/jsk_maps/0.0.4-0.tar.gz
version: jsk_demos-release-release-indigo-jsk_maps-0.0.4-0
- tar:
local-name: jsk_robot/baxtereus
uri: https://github.com/tork-a/jsk_robot-release/archive/release/indigo/baxtereus/1.1.0-1.tar.gz
version: jsk_robot-release-release-indigo-baxtereus-1.1.0-1
- tar:
local-name: jsk_robot/jsk_baxter_startup
uri: https://github.com/tork-a/jsk_robot-release/archive/release/indigo/jsk_baxter_startup/1.1.0-1.tar.gz
version: jsk_robot-release-release-indigo-jsk_baxter_startup-1.1.0-1
- tar:
local-name: moveit_robots/baxter_moveit_config
uri: https://github.com/ros-gbp/moveit_robots-release/archive/release/indigo/baxter_moveit_config/1.0.7-0.tar.gz
version: moveit_robots-release-release-indigo-baxter_moveit_config-1.0.7-0
# https://github.com/RethinkRobotics/baxter_interface/pull/86
- git:
local-name: baxter_interface
uri: https://github.com/k-okada/baxter_interface.git
version: development
# waiting for release in melodic: https://github.com/turtlebot/turtlebot/issues/272
- git:
local-name: turtlebot_description
uri: https://github.com/turtlebot-release/turtlebot-release.git
version: release/kinetic/turtlebot_description
- git:
local-name: kobuki_description
uri: https://github.com/yujinrobot-release/kobuki-release.git
version: release/kinetic/kobuki_description
- git:
local-name: create_description
uri: https://github.com/turtlebot-release/turtlebot_create-release.git
version: release/kinetic/create_description
- git:
local-name: dynamixel_motor
uri: https://github.com/pazeshun/dynamixel_motor.git
version: gripper-v6-devel
# waiting for release in noetic
- git:
local-name: openni_camera
uri: https://github.com/ros-drivers/openni_camera.git
version: indigo-devel
- git:
local-name: pr2_gripper_sensor
uri: https://github.com/PR2/pr2_gripper_sensor.git
version: hydro-devel
# https://github.com/locusrobotics/catkin_virtualenv/pull/85
- git:
local-name: catkin_virtualenv
uri: https://github.com/locusrobotics/catkin_virtualenv.git
version: 24ab7433e3e98a3ad4c7f3b29960026d858b73bf
# jsk_pr2eus is not released yet
- git:
local-name: jsk_pr2eus
uri: https://github.com/jsk-ros-pkg/jsk_pr2eus
version: master
# https://github.com/astuff/ml_classifiers/pull/6
- git:
local-name: ml_classifiers
uri: https://github.com/pazeshun/ml_classifiers.git
version: add-noetic-test
# find_package(collada_urdf) failed due to wrong collada_urdfConfig.cmake
# - https://github.com/ros/collada_urdf/issues/43
# - https://github.com/ros/collada_urdf/pull/44
- git:
local-name: collada_urdf
uri: https://github.com/werner291/collada_urdf.git
version: patch-1
# https://github.com/jsk-ros-pkg/jsk_visualization/pull/882, https://github.com/jsk-ros-pkg/jsk_visualization/pull/867
- git:
local-name: jsk_visualization
uri: https://github.com/pazeshun/jsk_visualization.git
version: fix-for-noetic
23 changes: 18 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,43 @@ env:
global:
- NOT_TEST_INSTALL=true
- ROS_PARALLEL_JOBS="-j2"
- ROSDEP_ADDITIONAL_OPTIONS="-n -q --ignore-src --skip-keys=jsk_smart_gui --skip-keys=ros3djs --skip-keys=pr2_calibration_launch --skip-keys=jsk_android_gui_api9 --skip-keys=ros2djs --skip-keys=face_recognition --skip-keys=roslibjs --skip-keys=force_proximity_ros --skip-keys=safe_teleop_base --skip-keys=pcl"
- USE_DEB=false
- USE_DOCKER=true
- USE_TRAVIS=true
# XXX: hotfix for chainer problem (https://github.com/chainer/chainer/issues/8545)
matrix:
- CHECK_PYTHON3_COMPILE=true
- ROS_DISTRO=indigo
- >
ROS_DISTRO=indigo
BUILD_PKGS="jsk_apc2015_common jsk_apc2016_common jsk_arc2017_common jsk_2015_05_baxter_apc jsk_2016_01_baxter_apc jsk_arc2017_baxter selective_dualarm_stowing sphand_driver sphand_driver_msgs vl53l0x_mraa_ros baxtergv6_apc2016 baxter_paper_filing"
BEFORE_SCRIPT='sudo -H pip install chainer==6.7.0 gdown==4.4.0 scikit-learn==0.19.1 protobuf==3.18.0'
# XXX: hotfix for chainer problem (https://github.com/chainer/chainer/issues/8545)
BEFORE_SCRIPT='sudo -H pip install -U numpy fcn chainercv chainer==6.7.0 gdown==4.4.0 scikit-learn==0.19.1 protobuf==3.17.3'
CATKIN_TOOLS_CONFIG_OPTIONS="--blacklist imagesift jsk_recognition_msgs jsk_perception jsk_pcl_ros_utils jsk_pcl_ros resized_image_transport checkerboard_detector fetcheus naoqieus jsk_fetch_startup jsk_nao_startup roseus_remote jsk_robot_startup jsk_robot_utils jsk_pr2_calibration pr2_base_trajectory_action jsk_baxter_web peppereus naoeus jsk_baxter_desktop jsk_pepper_startup jsk_pr2_startup jsk_pr2_desktop"
ROSDEP_ADDITIONAL_OPTIONS="-n -q --ignore-src --skip-keys=jsk_smart_gui --skip-keys=ros3djs --skip-keys=pr2_calibration_launch --skip-keys=jsk_android_gui_api9 --skip-keys=ros2djs --skip-keys=face_recognition --skip-keys=roslibjs --skip-keys=force_proximity_ros --skip-keys=safe_teleop_base --skip-keys=pcl"
- >
ROS_DISTRO=kinetic
BEFORE_SCRIPT='sudo -H pip install chainer==6.7.0 gdown==4.4.0 protobuf==3.18.0'
# XXX: hotfix for chainer problem (https://github.com/chainer/chainer/issues/8545)
BEFORE_SCRIPT='sudo -H pip install fcn chainercv chainer==6.7.0 gdown==4.4.0 protobuf==3.17.3'
CATKIN_TOOLS_CONFIG_OPTIONS="--blacklist imagesift jsk_recognition_msgs jsk_perception jsk_pcl_ros_utils jsk_pcl_ros resized_image_transport checkerboard_detector fetcheus naoqieus jsk_fetch_startup jsk_nao_startup roseus_remote jsk_robot_startup jsk_robot_utils jsk_pr2_calibration pr2_base_trajectory_action jsk_baxter_web peppereus naoeus jsk_baxter_desktop jsk_pepper_startup jsk_pr2_startup jsk_pr2_desktop test_catkin_virtualenv test_catkin_virtualenv_py3_isolated test_catkin_virtualenv_inherited"
ROSDEP_ADDITIONAL_OPTIONS="-n -q --ignore-src --skip-keys=jsk_smart_gui --skip-keys=ros3djs --skip-keys=pr2_calibration_launch --skip-keys=jsk_android_gui_api9 --skip-keys=ros2djs --skip-keys=face_recognition --skip-keys=roslibjs --skip-keys=force_proximity_ros --skip-keys=safe_teleop_base --skip-keys=pcl"
- >
ROS_DISTRO=melodic
BEFORE_SCRIPT='sudo -H pip install chainer==6.7.0 gdown==4.4.0 protobuf==3.18.0'
# XXX: hotfix for chainer problem (https://github.com/chainer/chainer/issues/8545)
BEFORE_SCRIPT='sudo -H pip install fcn chainercv chainer==6.7.0 gdown==4.4.0 protobuf==3.17.3'
CATKIN_TOOLS_CONFIG_OPTIONS="--blacklist imagesift jsk_recognition_msgs jsk_perception jsk_pcl_ros_utils jsk_pcl_ros resized_image_transport checkerboard_detector fetcheus naoqieus jsk_fetch_startup jsk_nao_startup roseus_remote jsk_robot_startup jsk_robot_utils jsk_pr2_calibration pr2_base_trajectory_action jsk_baxter_web peppereus naoeus jsk_baxter_desktop jsk_pepper_startup jsk_pr2_startup jsk_pr2_desktop"
ROSDEP_ADDITIONAL_OPTIONS="-n -q --ignore-src --skip-keys=jsk_smart_gui --skip-keys=ros3djs --skip-keys=pr2_calibration_launch --skip-keys=jsk_android_gui_api9 --skip-keys=ros2djs --skip-keys=face_recognition --skip-keys=roslibjs --skip-keys=force_proximity_ros --skip-keys=safe_teleop_base --skip-keys=pcl"
- >
ROS_DISTRO=noetic
# XXX: hotfix for chainer problem (https://github.com/chainer/chainer/issues/8545)
# Use apt-version scipy and skimage which are compatible with apt-version numpy
BEFORE_SCRIPT='sudo apt-get install -y -q python3-scipy python3-skimage; sudo -H pip3 install fcn chainercv chainer==6.7.0 gdown==4.4.0'
CATKIN_TOOLS_CONFIG_OPTIONS="--blacklist imagesift jsk_recognition_msgs jsk_perception jsk_pcl_ros_utils jsk_pcl_ros resized_image_transport checkerboard_detector fetcheus naoqieus jsk_fetch_startup jsk_nao_startup roseus_remote jsk_robot_startup jsk_robot_utils jsk_pr2_calibration pr2_base_trajectory_action jsk_baxter_web peppereus naoeus jsk_baxter_desktop jsk_pepper_startup jsk_pr2_startup jsk_pr2_desktop"
ROSDEP_ADDITIONAL_OPTIONS="-n -q --ignore-src --skip-keys=jsk_smart_gui --skip-keys=ros3djs --skip-keys=pr2_calibration_launch --skip-keys=jsk_android_gui_api9 --skip-keys=ros2djs --skip-keys=face_recognition --skip-keys=roslibjs --skip-keys=force_proximity_ros --skip-keys=safe_teleop_base --skip-keys=pcl --skip-keys=roseus_mongo --skip-keys=pr2_moveit_config --skip-keys=pr2_moveit_plugins --skip-keys=jsk_pr2_startup"
matrix:
allow_failures:
- env: ROS_DISTRO=indigo
script:
- if [ "${CHECK_PYTHON3_COMPILE}" == "true" ]; then python3 -m compileall .; exit $?; fi
- export DOCKER_IMAGE="jskrobotics/jsk_apc:${ROS_DISTRO}-latest-testing"
# build & test ROS packages
- source .travis/travis.sh
Expand Down
2 changes: 1 addition & 1 deletion archives/color_histogram_matcher_test.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions archives/demo_real.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions archives/interface_test.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions archives/master.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion archives/move_arm2target_bin_client.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions archives/move_arm_listener.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions archives/move_left_arm_server.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions archives/move_right_arm_server.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion archives/open_color_histogram_data.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion archives/setup_params.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading