From 779f9184598d0e66b4489cf73aadd2e2f3a291f6 Mon Sep 17 00:00:00 2001
From: Christophe Bedard <christophe.bedard@apex.ai>
Date: Wed, 9 Oct 2019 14:05:58 -0700
Subject: [PATCH 1/3] Change CI jobs to use full source images

---
 .gitlab-ci.yml | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 06c2660..61b9600 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,6 @@ variables:
 
 before_script:
   - vcs import < instrumentation.repos
-  - rosdep install --from-paths . -i . -i /root/ws --rosdistro dashing -y
   - . /root/ws/install/local_setup.sh
 
 build_enabled:
@@ -42,10 +41,6 @@ build_disabled:
 
 build_no_lttng:
   image: $base_image_id:base
-  before_script:
-    - vcs import < instrumentation.repos
-    - rosdep install --from-paths . -i . -i /root/ws --rosdistro dashing -y --skip-keys "python3-lttng python3-babeltrace console_bridge fastcdr fastrtps libopensplice67 libopensplice69 rti-connext-dds-5.3.1 urdfdom_headers"
-    - . /root/ws/install/local_setup.sh
   script:
     - colcon build --symlink-install --packages-up-to $PACKAGES_LIST
     - . install/local_setup.sh
@@ -53,23 +48,3 @@ build_no_lttng:
     - colcon test --packages-select $PACKAGES_LIST
     - colcon test-result
   <<: *global_artifacts
-
-build_from_source:
-  only:
-    - schedules
-  image: $base_image_id
-  before_script:
-    - wget https://raw.githubusercontent.com/ros2/ros2/master/ros2.repos
-    - mkdir src/
-    - vcs import src/ < ros2.repos
-    - rm -rf src/micro-ROS/
-    - vcs import --force src/ < instrumentation.repos
-    - rosdep install --from-paths src --ignore-src --rosdistro dashing -y --skip-keys "console_bridge fastcdr fastrtps libopensplice67 libopensplice69 rti-connext-dds-5.3.1 urdfdom_headers"
-  script:
-    - lttng-sessiond --daemonize
-    - colcon build --symlink-install --packages-up-to $PACKAGES_LIST
-    - . install/local_setup.sh
-    - ./build/tracetools/status
-    - colcon test --packages-select $PACKAGES_LIST
-    - colcon test-result
-  <<: *global_artifacts

From 20522e81bb956f23fcb74794d4b4e01d8f7f5640 Mon Sep 17 00:00:00 2001
From: Christophe Bedard <christophe.bedard@apex.ai>
Date: Wed, 9 Oct 2019 15:51:14 -0700
Subject: [PATCH 2/3] Display all test results

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61b9600..368e0bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ build_enabled:
     - . install/local_setup.sh
     - ./build/tracetools/status
     - colcon test --packages-select $PACKAGES_LIST
-    - colcon test-result
+    - colcon test-result --all
   <<: *global_artifacts
 
 build_disabled:
@@ -36,7 +36,7 @@ build_disabled:
     - . install/local_setup.sh
     - (! ./build/tracetools/status)
     - colcon test --packages-select $PACKAGES_LIST
-    - colcon test-result
+    - colcon test-result --all
   <<: *global_artifacts
 
 build_no_lttng:
@@ -46,5 +46,5 @@ build_no_lttng:
     - . install/local_setup.sh
     - (! ./build/tracetools/status)
     - colcon test --packages-select $PACKAGES_LIST
-    - colcon test-result
+    - colcon test-result --all
   <<: *global_artifacts

From 265a55aa939765fe6b088014bb76d183c4cc94cb Mon Sep 17 00:00:00 2001
From: Christophe Bedard <christophe.bedard@apex.ai>
Date: Wed, 9 Oct 2019 16:58:44 -0700
Subject: [PATCH 3/3] Rename CI jobs

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 368e0bf..aeded08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ before_script:
   - vcs import < instrumentation.repos
   - . /root/ws/install/local_setup.sh
 
-build_enabled:
+tracing_enabled:
   image: $base_image_id
   script:
     - lttng-sessiond --daemonize
@@ -29,7 +29,7 @@ build_enabled:
     - colcon test-result --all
   <<: *global_artifacts
 
-build_disabled:
+tracing_disabled:
   image: $base_image_id
   script:
     - colcon build --symlink-install --cmake-args " -DTRACETOOLS_DISABLED=ON" --packages-up-to $PACKAGES_LIST
@@ -39,7 +39,7 @@ build_disabled:
     - colcon test-result --all
   <<: *global_artifacts
 
-build_no_lttng:
+no_lttng:
   image: $base_image_id:base
   script:
     - colcon build --symlink-install --packages-up-to $PACKAGES_LIST