From 796d291cf2ee2f3ef9c28618401658a23653fd46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ingo=20L=C3=BCtkebohle?= <iluetkeb@gmail.com>
Date: Fri, 5 Jul 2019 09:27:04 +0000
Subject: [PATCH] Only prepare dependencies, not also the instrumented libs.

---
 .gitlab-ci.yml            |  4 +++-
 docker-ci-base/Dockerfile | 15 +++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee9d490..e047245 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,11 +8,13 @@ variables:
 services:
   - docker:dind
 
+before_script:
+  - vcs import < instrumentation.repos
+
 build_enabled:
   image: $base_image_id
   script:
     - lttng-sessiond --daemonize
-    - pwd
     - . /root/ws/install/local_setup.sh
     - colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST
     - . install/local_setup.sh
diff --git a/docker-ci-base/Dockerfile b/docker-ci-base/Dockerfile
index 3ee6fd8..23f233f 100644
--- a/docker-ci-base/Dockerfile
+++ b/docker-ci-base/Dockerfile
@@ -3,17 +3,16 @@ FROM ros:dashing-ros-base-bionic
 RUN apt-get update
 
 RUN apt-get install --no-install-recommends -y \
-    libasio-dev \
-    libtinyxml2-dev
-
-RUN apt-get install -y software-properties-common
+    software-properties-common
 RUN apt-add-repository -y ppa:lttng/ppa
 RUN apt-get update
+
 RUN apt-get install --no-install-recommends -y \
+    libasio-dev \
+    libtinyxml2-dev \
     lttng-tools \
     lttng-modules-dkms \
-    liblttng-ust-dev
-RUN apt-get install --no-install-recommends -y \
+    liblttng-ust-dev \
     python3-lttng \
     python3-babeltrace
 
@@ -24,8 +23,8 @@ RUN apt-get install --no-install-recommends -y \
 RUN mkdir /root/ws
 COPY . /root/ws
 WORKDIR /root/ws
-RUN vcs import < instrumentation.repos && vcs import < ci_source_deps.repos
+RUN vcs import < ci_source_deps.repos
 RUN 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"
 RUN apt-get purge -y ros-dashing-fastrtps
 
-RUN . /opt/ros/dashing/setup.sh && colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to ros2trace tracetools tracetools_launch tracetools_read tracetools_test tracetools_trace
+RUN . /opt/ros/dashing/setup.sh && colcon build --symlink-install