Merge branch 'master' into '14-create-docker-image-with-dependencies-installed-already'

# Conflicts:
#   .gitlab-ci.yml

.gitlab-ci.yml

@@ -8,20 +8,6 @@ variables:
 services:
   - docker:dind
 
-# build:
-#   script:
-#     - colcon build --symlink-install --packages-up-to $PACKAGES_LIST
-#     - colcon test --packages-select $PACKAGES_LIST
-#   artifacts:
-#     paths:
-#       - install
-#       - build/*/test_results/*/*.xunit.xml
-#       - build/*/pytest.xml
-#     reports:
-#       junit:
-#         - build/*/test_results/*/*.xunit.xml
-#         - build/*/pytest.xml
-
 build_enabled:
   script:
     - vcs import < instrumentation.repos
@@ -29,6 +15,7 @@ build_enabled:
     - apt-get update
     - rosdep update
     - rosdep install --from-paths . --ignore-src --rosdistro dashing -y --skip-keys "console_bridge fastcdr fastrtps libopensplice67 libopensplice69 rti-connext-dds-5.3.1 urdfdom_headers"
+    - apt-get purge -y ros-dashing-fastrtps
     - lttng-sessiond --daemonize
     - colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST
     - colcon test --packages-select $PACKAGES_LIST