Skip to content

Commit

Permalink
Merge branch 'master' into kinova-gen3
Browse files Browse the repository at this point in the history
  • Loading branch information
k-okada authored Jul 16, 2021
2 parents 4421065 + ef18929 commit bac895a
Show file tree
Hide file tree
Showing 33 changed files with 360 additions and 70 deletions.
48 changes: 48 additions & 0 deletions .github/workflows/indigo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# generated by `./generate_action_config.py indigo`
# jsk_travis
on:
push:
branches:
- master
pull_request:

env:
DISPLAY: ':0.0'

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

# use pip installed image due to https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/237 : (Note that pip==21.0.1 is incompatible with python 2.x)
container: jskrobotics/ros-ubuntu:14.04

steps:
- name: Install latest git ( use sudo for ros-ubuntu )
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: Before Checkout # need for actoins/checkout with ros-ubuntu container
run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
- name: Chcekout
uses: actions/checkout@v2
- name: Start X server
run: |
sudo apt-get -y -qq install mesa-utils x11-xserver-utils xserver-xorg-video-dummy
export DISPLAY=:0
wget https://raw.githubusercontent.com/jsk-ros-pkg/jsk_travis/master/dummy.xorg.conf -O /tmp/dummy.xorg.conf
sudo Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile /tmp/xorg.log -config /tmp/dummy.xorg.conf $DISPLAY &
sleep 3 # wait x server up
export QT_X11_NO_MITSHM=1 # http://wiki.ros.org/docker/Tutorials/GUI
xhost +local:root
- name: Run jsk_travis
uses: jsk-ros-pkg/jsk_travis@master
with:
ROS_PARALLEL_JOBS : "-j2"
CATKIN_PARALLEL_JOBS : "-p2"
ROS_PARALLEL_TEST_JOBS : "-j1"
CATKIN_PARALLEL_TEST_JOBS : "-p1"
NOT_TEST_INSTALL : true
ROS_DISTRO : indigo
USE_DEB : false
TEST_PKGS : "jsk_robot_startup" # app_manager required to pass jsk_fetch test, so this job mainly test if we can build sources
# to install pepper_meshes, nao_meshes, the licenses have to be accepted
BEFORE_SCRIPT : "echo 'ros-indigo-pepper-meshes ros-pepper-meshes/accepted-ros-pepper-meshes boolean true' | sudo debconf-set-selections; sudo apt-get install -y -qq ros-indigo-pepper-meshes; echo 'ros-indigo-nao-meshes ros-nao-meshes/accepted-ros-nao-meshes boolean true' | sudo debconf-set-selections; sudo apt-get install -y -qq ros-indigo-nao-meshes; apt-get download ros-indigo-julius; wget -O stripdeb.sh https://gist.githubusercontent.com/jordansissel/748313/raw/8aebce360bc082e33af7bba3c90f755eb655783b/stripdeb.sh; bash stripdeb.sh ros-indigo-julius*.deb; sudo dpkg --force-all -i ros-indigo-julius*.deb; sudo apt-get -y -f install; sudo apt-mark hold ros-indigo-julius"
45 changes: 45 additions & 0 deletions .github/workflows/kinetic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# generated by `./generate_action_config.py kinetic`
# jsk_travis
on:
push:
branches:
- master
pull_request:

env:
DISPLAY: ':0.0'

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

container: ubuntu:16.04

steps:
- name: Install latest git ( use sudo for ros-ubuntu )
run: apt-get update && apt-get install -y software-properties-common && apt-get update && add-apt-repository -y ppa:git-core/ppa && apt-get update && apt-get install -y git
- name: Chcekout
uses: actions/checkout@v2
- name: Start X server
run: |
echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections # set non interactive tzdata https://stackoverflow.com/questions/8671308/non-interactive-method-for-dpkg-reconfigure-tzdata
apt-get -y -qq install mesa-utils x11-xserver-utils xserver-xorg-video-dummy wget
export DISPLAY=:0
wget https://raw.githubusercontent.com/jsk-ros-pkg/jsk_travis/master/dummy.xorg.conf -O /tmp/dummy.xorg.conf
Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile /tmp/xorg.log -config /tmp/dummy.xorg.conf $DISPLAY &
sleep 3 # wait x server up
export QT_X11_NO_MITSHM=1 # http://wiki.ros.org/docker/Tutorials/GUI
xhost +local:root
- name: Run jsk_travis
uses: jsk-ros-pkg/jsk_travis@master
with:
ROS_PARALLEL_JOBS : "-j2"
CATKIN_PARALLEL_JOBS : "-p2"
ROS_PARALLEL_TEST_JOBS : "-j1"
CATKIN_PARALLEL_TEST_JOBS : "-p1"
NOT_TEST_INSTALL : true
ROS_DISTRO : kinetic
USE_DEB : false
BEFORE_SCRIPT : "wstool merge jsk_robot/jsk_fetch_robot/jsk_fetch_user.rosinstall.kinetic; wstool update; apt-get download ros-kinetic-julius; wget -O stripdeb.sh https://gist.githubusercontent.com/jordansissel/748313/raw/8aebce360bc082e33af7bba3c90f755eb655783b/stripdeb.sh; bash stripdeb.sh ros-kinetic-julius*.deb; sudo dpkg --force-all -i ros-kinetic-julius*.deb; sudo apt-get -y -f install; sudo apt-mark hold ros-kinetic-julius"
EXTRA_DEB : "ros-kinetic-convex-decomposition ros-kinetic-ivcon"
44 changes: 44 additions & 0 deletions .github/workflows/melodic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# generated by `./generate_action_config.py melodic`
# jsk_travis
on:
push:
branches:
- master
pull_request:

env:
DISPLAY: ':0.0'

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

container: ubuntu:18.04

steps:
- name: Install latest git ( use sudo for ros-ubuntu )
run: apt-get update && apt-get install -y software-properties-common && apt-get update && add-apt-repository -y ppa:git-core/ppa && apt-get update && apt-get install -y git
- name: Chcekout
uses: actions/checkout@v2
- name: Start X server
run: |
echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections # set non interactive tzdata https://stackoverflow.com/questions/8671308/non-interactive-method-for-dpkg-reconfigure-tzdata
apt-get -y -qq install mesa-utils x11-xserver-utils xserver-xorg-video-dummy wget
export DISPLAY=:0
wget https://raw.githubusercontent.com/jsk-ros-pkg/jsk_travis/master/dummy.xorg.conf -O /tmp/dummy.xorg.conf
Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile /tmp/xorg.log -config /tmp/dummy.xorg.conf $DISPLAY &
sleep 3 # wait x server up
export QT_X11_NO_MITSHM=1 # http://wiki.ros.org/docker/Tutorials/GUI
xhost +local:root
- name: Run jsk_travis
uses: jsk-ros-pkg/jsk_travis@master
with:
ROS_PARALLEL_JOBS : "-j2"
CATKIN_PARALLEL_JOBS : "-p2"
ROS_PARALLEL_TEST_JOBS : "-j1"
CATKIN_PARALLEL_TEST_JOBS : "-p1"
NOT_TEST_INSTALL : true
ROS_DISTRO : melodic
USE_DEB : false
BEFORE_SCRIPT : "apt-get download ros-melodic-julius; wget -O stripdeb.sh https://gist.githubusercontent.com/jordansissel/748313/raw/8aebce360bc082e33af7bba3c90f755eb655783b/stripdeb.sh; bash stripdeb.sh ros-melodic-julius*.deb; sudo dpkg --force-all -i ros-melodic-julius*.deb; sudo apt-get -y -f install; sudo apt-mark hold ros-melodic-julius"
45 changes: 45 additions & 0 deletions .github/workflows/noetic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# generated by `./generate_action_config.py noetic`
# jsk_travis
on:
push:
branches:
- master
pull_request:

env:
DISPLAY: ':0.0'

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

container: ubuntu:20.04

steps:
- name: Install latest git ( use sudo for ros-ubuntu )
run: apt-get update && apt-get install -y software-properties-common && apt-get update && add-apt-repository -y ppa:git-core/ppa && apt-get update && apt-get install -y git
- name: Chcekout
uses: actions/checkout@v2
- name: Start X server
run: |
echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections # set non interactive tzdata https://stackoverflow.com/questions/8671308/non-interactive-method-for-dpkg-reconfigure-tzdata
apt-get -y -qq install mesa-utils x11-xserver-utils xserver-xorg-video-dummy wget
export DISPLAY=:0
wget https://raw.githubusercontent.com/jsk-ros-pkg/jsk_travis/master/dummy.xorg.conf -O /tmp/dummy.xorg.conf
Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile /tmp/xorg.log -config /tmp/dummy.xorg.conf $DISPLAY &
sleep 3 # wait x server up
export QT_X11_NO_MITSHM=1 # http://wiki.ros.org/docker/Tutorials/GUI
xhost +local:root
- name: Run jsk_travis
uses: jsk-ros-pkg/jsk_travis@master
with:
ROS_PARALLEL_JOBS : "-j2"
CATKIN_PARALLEL_JOBS : "-p2"
ROS_PARALLEL_TEST_JOBS : "-j1"
CATKIN_PARALLEL_TEST_JOBS : "-p1"
NOT_TEST_INSTALL : true
ROS_DISTRO : noetic
USE_DEB : false
TEST_PKGS : "jsk_robot_startup" # check only jsk_robot_startup
BEFORE_SCRIPT : "apt-get download ros-noetic-julius; wget -O stripdeb.sh https://gist.githubusercontent.com/jordansissel/748313/raw/8aebce360bc082e33af7bba3c90f755eb655783b/stripdeb.sh; bash stripdeb.sh ros-noetic-julius*.deb; sudo dpkg --force-all -i ros-noetic-julius*.deb; sudo apt-get -y -f install; sudo apt-mark hold ros-noetic-julius"
24 changes: 24 additions & 0 deletions .github/workflows/python2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# generated by `./generate_action_config.py noetic`
# jsk_travis
on:
push:
branches:
- master
pull_request:

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

container: ubuntu:20.04

steps:
- name: Install latest git to download .git directory in actions/checkout@v2 ( use sudo for ros-ubuntu )
run: apt-get update && apt-get install -y software-properties-common && apt-get update && add-apt-repository -y ppa:git-core/ppa && apt-get update && apt-get install -y git
- name: Chcekout
uses: actions/checkout@v2
- name: Check Python2
run: |
apt update -q && apt install -y -q python2
python2 -m compileall .
24 changes: 24 additions & 0 deletions .github/workflows/python3.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# generated by `./generate_action_config.py noetic`
# jsk_travis
on:
push:
branches:
- master
pull_request:

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

container: ubuntu:20.04

steps:
- name: Install latest git to download .git directory in actions/checkout@v2 ( use sudo for ros-ubuntu )
run: apt-get update && apt-get install -y software-properties-common && apt-get update && add-apt-repository -y ppa:git-core/ppa && apt-get update && apt-get install -y git
- name: Chcekout
uses: actions/checkout@v2
- name: Check Python3
run: |
apt update -q && apt install -y -q python3 git 2to3
bash -c "ret=0; trap 'ret=1' ERR; python3 -m compileall .; 2to3 -w -f except -f execfile -f has_key -f import -f raw_input -f zip .; git diff --exit-code . :^.travis > /dev/null; echo Exitting with \$ret; exit \$ret"
44 changes: 44 additions & 0 deletions .travis.rosinstall.noetic
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
- git:
uri: http://github.com/RethinkRobotics/baxter_common.git
local-name: RethinkRobotics/baxter_common
version: kinetic-devel
- git:
# https://github.com/RethinkRobotics/baxter_simulator/pull/130
uri: https://github.com/EmaroLab/baxter_simulator.git
local-name: RethinkRobotics/baxter_simulator
version: master
- git:
uri: https://github.com/RethinkRobotics/baxter_interface.git
local-name: baxter_interface
version: development
- git:
uri: https://github.com/RethinkRobotics/baxter_tools.git
local-name: baxter_tools
version: development
- git:
uri: https://github.com/ros-planning/moveit_robots.git
local-name: ros-planning/moveit_robots
version: kinetic-devel
- git: # wait for melodic release https://github.com/ros-naoqi/pepper_robot/issues/50
uri: https://github.com/ros-naoqi/pepper_robot.git
local-name: pepper_robot
- git: # https://github.com/ros-naoqi/nao_robot/issues/40
uri: https://github.com/ros-naoqi/nao_robot.git
local-name: nao_robot
- git: # use naoqi_pose, wait for melodic release https://github.com/ros-naoqi/naoqi_bridge/issues/94
uri: https://github.com/ros-naoqi/naoqi_bridge-release.git
local-name: naoqi_pose
version: release/kinetic/naoqi_pose
# jsk_fetch_startup requires fetch_ros with following PRs.
# https://github.com/fetchrobotics/fetch_ros/pull/144
# https://github.com/fetchrobotics/fetch_ros/pull/146
- git:
local-name: fetchrobotics/fetch_ros
uri: https://github.com/fetchrobotics/fetch_ros.git
version: ba4bafdb802e474487d1e0d893aa25c9535dc55f
# for drc_task_common in jsk_demos
# jsk_control is not released in melodic
- tar:
local-name: jsk_control/jsk_ik_server
uri: https://github.com/tork-a/jsk_control-release/archive/release/kinetic/jsk_ik_server/0.1.14-0.tar.gz
version: jsk_control-release-release-kinetic-jsk_ik_server-0.1.14-0
13 changes: 11 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ dist: bionic
language: python
services:
- docker
addons:
apt:
packages:
- 2to3
cache:
apt: true
pip: true
Expand All @@ -26,6 +30,8 @@ env:
- CATKIN_PARALLEL_TEST_JOBS="-p1"
- NOT_TEST_INSTALL=true
matrix:
- CHECK_PYTHON3_COMPILE=true
- CHECK_PYTHON2_COMPILE=true
- ROS_DISTRO=hydro USE_DEB=true
- ROS_DISTRO=hydro USE_DEB=false EXTRA_DEB="ros-hydro-convex-decomposition ros-hydro-ivcon" BUILD_PKGS="jsk_pr2_calibration jsk_robot_startup pr2_base_trajectory_action jsk_pr2_startup jsk_pr2_desktop"
- ROS_DISTRO=indigo USE_DEB=true TEST_PKGS="jsk_robot_startup" # app_manager required to pass jsk_fetch test, so this job mainly test if we can build sources
Expand All @@ -46,8 +52,11 @@ before_script:
# to install pepper_meshes, nao_meshes, the licenses have to be accepted
- if [ "$ROS_DISTRO" == "indigo" ]; then export BEFORE_SCRIPT="echo \"ros-indigo-pepper-meshes ros-pepper-meshes/accepted-ros-pepper-meshes boolean true\" | sudo debconf-set-selections; sudo apt-get install -y -qq ros-$ROS_DISTRO-pepper-meshes"; fi
- if [ "$ROS_DISTRO" == "indigo" ]; then export BEFORE_SCRIPT="echo \"ros-indigo-nao-meshes ros-nao-meshes/accepted-ros-nao-meshes boolean true\" | sudo debconf-set-selections; sudo apt-get install -y -qq ros-$ROS_DISTRO-nao-meshes"; fi
- if [ "$ROS_DISTRO" == "kinetic" ]; then export BEFORE_SCRIPT="wstool merge jsk_robot/jsk_fetch_robot/jsk_fetch.rosinstall.kinetic; wstool update"; fi
- if [ "$ROS_DISTRO" == "kinetic" ]; then export BEFORE_SCRIPT="wstool merge jsk_robot/jsk_fetch_robot/jsk_fetch_user.rosinstall.kinetic; wstool update"; fi
- if [ "$ROS_DISTRO" == "melodic" ]; then export BEFORE_SCRIPT="pwd; ls -al ; ls -al jsk_robot/; ls -al jsk_robot/.travis.rosinstall.melodic; wstool merge jsk_robot/.travis.rosinstall.melodic; wstool update"; fi
# skip running postinst for ros-ROS_DISTRO-julius https://gist.github.com/jordansissel/748313#file-stripdeb-sh
- export BEFORE_SCRIPT="apt-get download ros-$ROS_DISTRO-julius; wget -O stripdeb.sh https://gist.githubusercontent.com/jordansissel/748313/raw/8aebce360bc082e33af7bba3c90f755eb655783b/stripdeb.sh; bash stripdeb.sh ros-$ROS_DISTRO-julius*.deb; sudo dpkg --force-all -i ros-$ROS_DISTRO-julius*.deb; sudo apt-get -y -f install; sudo apt-mark hold ros-$ROS_DISTRO-julius; $BEFORE_SCRIPT"
script: .travis/travis.sh
script:
- if [ "${CHECK_PYTHON3_COMPILE}" == "true" ]; then bash -c "ret=0; trap 'ret=1' ERR; python3 -m compileall .; 2to3 -w -f except -f execfile -f has_key -f import -f raw_input -f zip .; git diff --exit-code . :^.travis > /dev/null; echo Exitting with \$ret; exit \$ret"; exit $?; fi
- if [ "${CHECK_PYTHON2_COMPILE}" == "true" ]; then python2 -m compileall .; exit $?; fi
- source .travis/travis.sh
8 changes: 4 additions & 4 deletions jsk_aero_robot/jsk_aero_startup/test/roslaunch_depends.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,21 +86,21 @@ def __str__(self):

def _get_arg_value(tag, context):
name = tag.attributes['name'].value
if tag.attributes.has_key('value'):
if 'value' in tag.attributes.keys():
return resolve_args(tag.attributes['value'].value, context)
elif name in context['arg']:
return context['arg'][name]
elif tag.attributes.has_key('default'):
elif 'default' in tag.attributes.keys():
return resolve_args(tag.attributes['default'].value, context)
else:
raise RoslaunchDepsException("No value for arg [%s]"%(name))

def _check_ifunless(tag, context):
if tag.attributes.has_key('if'):
if 'if' in tag.attributes.keys():
val = resolve_args(tag.attributes['if'].value, context)
if not convert_value(val, 'bool'):
return False
elif tag.attributes.has_key('unless'):
elif 'unless' in tag.attributes.keys():
val = resolve_args(tag.attributes['unless'].value, context)
if convert_value(val, 'bool'):
return False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,21 +86,21 @@ def __str__(self):

def _get_arg_value(tag, context):
name = tag.attributes['name'].value
if tag.attributes.has_key('value'):
if 'value' in tag.attributes.keys():
return resolve_args(tag.attributes['value'].value, context)
elif name in context['arg']:
return context['arg'][name]
elif tag.attributes.has_key('default'):
elif 'default' in tag.attributes.keys():
return resolve_args(tag.attributes['default'].value, context)
else:
raise RoslaunchDepsException("No value for arg [%s]"%(name))

def _check_ifunless(tag, context):
if tag.attributes.has_key('if'):
if 'if' in tag.attributes.keys():
val = resolve_args(tag.attributes['if'].value, context)
if not convert_value(val, 'bool'):
return False
elif tag.attributes.has_key('unless'):
elif 'unless' in tag.attributes.keys():
val = resolve_args(tag.attributes['unless'].value, context)
if convert_value(val, 'bool'):
return False
Expand Down
4 changes: 2 additions & 2 deletions jsk_fetch_robot/jsk_fetch_startup/scripts/warning.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def run(self):
global sound
for status in self.error_status:
# ignore error status if the error already occured in the latest 10 minites
if error_status_in_10_min.has_key(status.message):
if status.message in error_status_in_10_min:
if rospy.Time.now().secs - error_status_in_10_min[status.message] < 600:
continue
else:
Expand Down Expand Up @@ -144,7 +144,7 @@ def diagnostics_status_callback(self, msg):
##
## check if this comes from /robot_driver
callerid = msg._connection_header['callerid']
if not self.diagnostics_speak_thread.has_key(callerid):
if callerid not in self.diagnostics_speak_thread:
self.diagnostics_speak_thread[callerid] = None
error_status = filter(lambda n: n.level in self.diagnostics_list, msg.status)
# when RunStopped, ignore message from *_mcb and *_breaker
Expand Down
Loading

0 comments on commit bac895a

Please sign in to comment.