Merge pull request #1106 from ruffsl/rm_colcon_ignore

Remove COLCON_IGNORE from nav2_system_tests

.circleci/config.yml

@@ -193,7 +193,6 @@ references:
     run:
       name: Post Checkout
       command: |
-        rm $OVERLAY_WS/src/navigation2/nav2_system_tests/COLCON_IGNORE
         if ! cmp \
           $OVERLAY_WS/src/navigation2/tools/ros2_dependencies.repos \
           $UNDERLAY_WS/ros2_dependencies.repos >/dev/null 2>&1

Dockerfile

@@ -72,7 +72,6 @@ RUN . $UNDERLAY_WS/install/setup.sh && \
 
 # build overlay source
 ARG OVERLAY_MIXINS="release ccache"
-RUN rm $OVERLAY_WS/src/navigation2/nav2_system_tests/COLCON_IGNORE
 RUN . $UNDERLAY_WS/install/setup.sh && \
     colcon build \
       --symlink-install \

Dockerfile.full_ros_build

@@ -3,7 +3,6 @@
 #
 # Example build command:
 # export CMAKE_BUILD_TYPE=Debug
-# export BUILD_SYSTEM_TESTS=False
 #
 # This determines which version of the ROS2 code base to pull
 # export ROS2_BRANCH=master
@@ -13,15 +12,16 @@
 # has been removed that an older codebase depends on. In those cases, using
 # ros:DISTRO-ros-core would be a good choice where distro is crystal, dashing, etc.
 # export ROS2_DOCKER_IMAGE=osrf/ros2:nightly
-# docker build -t nav2:full_ros_build --build-arg BUILD_SYSTEM_TESTS
-#   --build-arg CMAKE_BUILD_TYPE -f Dockerfile.full_ros_build ./
+# docker build -t nav2:full_ros_build
+#   --build-arg CMAKE_BUILD_TYPE \
+#   -f Dockerfile.full_ros_build ./
 
 # We're only building on top of a ROS docker image to get the basics
 # prerequisites installed such as the apt source, rosdep, etc. We don't want to
 # actually use any of the ros dashing packages. Instead we are going to build
 # everything from source in one big workspace.
-ARG ROS2_DOCKER_BRANCH=osrf/ros2:nightly
-FROM $ROS2_DOCKER_BRANCH
+ARG FROM_IMAGE=osrf/ros2:nightly
+FROM $FROM_IMAGE
 
 # install ROS2 dependencies
 RUN apt-get update && apt-get install -q -y \
@@ -49,15 +49,6 @@ ENV NAV2_DEPS_DIR $ROS2_WS/src/navigation2_dependencies
 RUN mkdir -p $NAV2_DEPS_DIR
 RUN vcs import src < $NAV2_DIR/tools/ros2_dependencies.repos
 
-# delete nav2_system_tests/COLCON_IGNORE before running rosdep, otherwise it
-# doesn't install nav2_system_tests dependencies.
-ARG BUILD_SYSTEM_TESTS=True
-RUN if [ "$BUILD_SYSTEM_TESTS" = "True" ] ; then \
-        rm $NAV2_DIR/nav2_system_tests/COLCON_IGNORE ; \
-        echo "Building of system tests enabled" ; \
-    fi
-
-
 # install package dependencies
 RUN apt-get update && \
     rosdep install -q -y \

Dockerfile.release_branch

@@ -3,14 +3,13 @@
 #
 # Example build command:
 # export CMAKE_BUILD_TYPE=Debug
-# export BUILD_SYSTEM_TESTS=False
-# docker build -t nav2:release_branch --build-arg ROS2_BRANCH=dashing \
-#  --build-arg BUILD_SYSTEM_TESTS #   --build-arg CMAKE_BUILD_TYPE \
-#  -f Dockerfile.release_branch ./
+# docker build -t nav2:release_branch \
+#   --build-arg FROM_IMAGE=dashing \
+#   --build-arg CMAKE_BUILD_TYPE \
+#   -f Dockerfile.release_branch ./
 
-ARG ROS2_BRANCH=dashing
-
-FROM ros:$ROS2_BRANCH
+ARG FROM_IMAGE=dashing
+FROM ros:$FROM_IMAGE
 
 # copy ros package repo
 ENV NAV2_WS /opt/nav2_ws
@@ -18,14 +17,6 @@ RUN mkdir -p $NAV2_WS/src
 WORKDIR $NAV2_WS/src
 COPY ./ navigation2/
 
-# delete nav2_system_tests/COLCON_IGNORE before running rosdep, otherwise it
-# doesn't install nav2_system_tests dependencies.
-ARG BUILD_SYSTEM_TESTS=True
-RUN if [ "$BUILD_SYSTEM_TESTS" = "True" ] ; then \
-        rm $NAV2_WS/src/navigation2/nav2_system_tests/COLCON_IGNORE ; \
-        echo "Building of system tests enabled" ; \
-    fi
-
 # install navigation2 package dependencies
 WORKDIR $NAV2_WS
 RUN . /opt/ros/$ROS_DISTRO/setup.sh && \

nav2_system_tests/src/system/README.md

@@ -3,11 +3,7 @@
 This is a 'top level' system test which will use Gazebo to simulate a Robot moving from an known initial starting position to a goal pose. 
 
 ## To run the test
-First, remove the COLCON_IGNORE; this exists so the system tests won't be in the debian release package
-```
-rm nav2_system_tests/COLCON_IGNORE
-```
-Then, you must build navigation2 including this package:
+First, you must build navigation2 including this package:
 ```
 colcon build --symlink-install
 ```