From a3eebcee0bb33509ac005808e53dc5d1cb36a6e8 Mon Sep 17 00:00:00 2001 From: Carl Delsey <carl.r.delsey@intel.com> Date: Fri, 6 Dec 2019 16:51:28 -0800 Subject: [PATCH] Dependency test related fixes needed for eloquent release. (#1425) * Update rosdep in docker build * Adding missing dependency --- full_ros_build.Dockerfile | 2 ++ nav2_system_tests/package.xml | 1 + release_branch.Dockerfile | 2 ++ 3 files changed, 5 insertions(+) diff --git a/full_ros_build.Dockerfile b/full_ros_build.Dockerfile index 85667a13..a090b305 100644 --- a/full_ros_build.Dockerfile +++ b/full_ros_build.Dockerfile @@ -63,6 +63,8 @@ RUN wget https://raw.githubusercontent.com/ros2/ros2/$ROS2_BRANCH/ros2.repos \ # get skip keys COPY ./tools/skip_keys.txt ./ +RUN rosdep update + # copy underlay manifests COPY --from=cache /tmp/underlay_ws src/underlay RUN cd src/underlay && colcon list --names-only | \ diff --git a/nav2_system_tests/package.xml b/nav2_system_tests/package.xml index afd4b166..2c8ebce8 100644 --- a/nav2_system_tests/package.xml +++ b/nav2_system_tests/package.xml @@ -53,6 +53,7 @@ <test_depend>ament_lint_common</test_depend> <test_depend>ament_lint_auto</test_depend> <test_depend>ament_cmake_gtest</test_depend> + <test_depend>ament_cmake_pytest</test_depend> <test_depend>launch</test_depend> <test_depend>launch_ros</test_depend> <test_depend>launch_testing</test_depend> diff --git a/release_branch.Dockerfile b/release_branch.Dockerfile index 4be39e34..3a031134 100644 --- a/release_branch.Dockerfile +++ b/release_branch.Dockerfile @@ -11,6 +11,8 @@ ARG FROM_IMAGE=dashing FROM ros:$FROM_IMAGE +RUN rosdep update + # copy ros package repo ENV NAV2_WS /opt/nav2_ws RUN mkdir -p $NAV2_WS/src -- GitLab