From 13a3cabc2e00b5170178c584c46307dd6a10b60e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ingo=20L=C3=BCtkebohle?= <iluetkeb@gmail.com>
Date: Fri, 5 Jul 2019 12:03:47 +0000
Subject: [PATCH 1/4] Allow building CI image based on schedule

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e047245..c82ddc6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,4 +39,5 @@ ci_base_image:
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com
     - docker push $base_image_id
   only:
-    - /.*docker.*/
\ No newline at end of file
+    - /.*docker.*/
+    - scheduled
\ No newline at end of file

From 91a3deacec29fe4b1a2873d9fc3843680cd77a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ingo=20L=C3=BCtkebohle?= <iluetkeb@gmail.com>
Date: Fri, 5 Jul 2019 12:09:43 +0000
Subject: [PATCH 2/4] Only do vcs after building image

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c82ddc6..babfa09 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,12 +8,15 @@ variables:
 services:
   - docker:dind
 
-before_script:
-  - vcs import < instrumentation.repos
+stage:
+ - deps
+ - build
 
 build_enabled:
   image: $base_image_id
+  stage: build
   script:
+    - vcs import < instrumentation.repos
     - lttng-sessiond --daemonize
     - . /root/ws/install/local_setup.sh
     - colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST
@@ -33,6 +36,7 @@ build_enabled:
     - /.*docker.*/
         
 ci_base_image:
+  stage: deps
   image: docker:stable
   script:
     - docker build --tag $base_image_id -f docker-ci-base/Dockerfile .

From 3261b394b416ce50df181ad89d03a82ddb3c2476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ingo=20L=C3=BCtkebohle?= <iluetkeb@gmail.com>
Date: Fri, 5 Jul 2019 12:09:57 +0000
Subject: [PATCH 3/4] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index babfa09..a2ed33f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ variables:
 services:
   - docker:dind
 
-stage:
+stages:
  - deps
  - build
 

From 9d8ab5f17ef55639f32ad1a8264b6e495f3c7a26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ingo=20L=C3=BCtkebohle?= <iluetkeb@gmail.com>
Date: Fri, 5 Jul 2019 12:59:45 +0000
Subject: [PATCH 4/4] Fix image location

---
 .gitlab-ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2ed33f..38b4a51 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,7 @@
-image: registry.gitlab.com/ros_tracing/ros2_tracing/ci-base:latest
-
 variables:
   DOCKER_DRIVER: overlay2
   PACKAGES_LIST: ros2trace tracetools tracetools_launch tracetools_read tracetools_test tracetools_trace
-  base_image_id: registry.gitlab.com/ros_tracing/ros2_tracing/ci-base
+  base_image_id: registry.gitlab.com/micro-ros/ros_tracing/ros2_tracing/ci-base
 
 services:
   - docker:dind