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

Fix CI tests #706

Merged
merged 11 commits into from
Apr 12, 2023
Merged

Fix CI tests #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ea2ae77
install from turtlebot3 from sources
ygoumaz Apr 11, 2023
2738d02
install git
ygoumaz Apr 11, 2023
8523bc0
Add target ws
ygoumaz Apr 11, 2023
7356b37
separate ws for turtlebot
ygoumaz Apr 11, 2023
631520e
cleanup + fix ros not found
ygoumaz Apr 11, 2023
108468f
try upstream ws
ygoumaz Apr 11, 2023
2ad84dd
ignore rviz in CI
ygoumaz Apr 11, 2023
163ae81
fix duplicate name
ygoumaz Apr 11, 2023
778405a
clone fork
ygoumaz Apr 12, 2023
f058ef5
remove use rviz from launch file
ygoumaz Apr 12, 2023
28cc579
cleanup + comment
ygoumaz Apr 12, 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
8 changes: 6 additions & 2 deletions scripts/ci_after_init.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ NIGHTLY_DATE=`date --date="${LAST_NIGHTLY_DAY_OLD} day ago" +"%-d_%-m_%Y"`
WEBOTS_NIGHTLY_VERSION="nightly_${NIGHTLY_DATE}"

apt update
apt install -y wget dialog apt-utils psmisc lsb-release
apt install -y wget dialog apt-utils psmisc lsb-release git
wget https://github.com/cyberbotics/webots/releases/download/${WEBOTS_NIGHTLY_VERSION}/webots_${WEBOTS_RELEASE_VERSION}_amd64.deb -O /tmp/webots.deb
apt install -y /tmp/webots.deb xvfb

Expand All @@ -28,7 +28,11 @@ fi

# The following packages are not available in the ROS 2 Rolling distribution. Therefore, we cannot include them in the package.xml, but we have to install them manually here.
if [[ "${ROS_DISTRO}" != "rolling" ]]; then
apt install -y ros-${ROS_DISTRO}-turtlebot3-cartographer ros-${ROS_DISTRO}-turtlebot3-navigation2 ros-${ROS_DISTRO}-nav2-bringup
apt install -y ros-${ROS_DISTRO}-nav2-bringup

# Turtlebot3 must be installed from sources to make RViz optional
mkdir -p /root/turtlebot_ws/src
git clone -b ${ROS_DISTRO}-devel https://github.com/cyberbotics/turtlebot3.git /root/turtlebot_ws/src
fi

# TODO: Revert once the https://github.com/ros-planning/navigation2/issues/3033 issue is fixed.
Expand Down
5 changes: 5 additions & 0 deletions scripts/ci_before_init_embed.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ export WEBOTS_RELEASE_VERSION=2023a-rev1
export WEBOTS_OFFSCREEN=1
export CI=1
export DEBIAN_FRONTEND=noninteractive
# The upstream workspace allows to install packages from sources for the tests (Turtlebot3 here)
if [[ "${ROS_DISTRO}" != "rolling" ]]; then
export UPSTREAM_WORKSPACE=/root/turtlebot_ws/
fi


# TODO: Revert once the https://github.com/ros-planning/navigation2/issues/3033 issue is fixed.
# Fast-DDS is not working properly with the Nav2 package on Humble. Using Cyclone DDS instead.
Expand Down