From 92ce0dd51a783347daa37addb3d36b44f68f1529 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sat, 29 Feb 2020 19:59:59 -0500 Subject: [PATCH 1/3] Use lowercase CI variables Signed-off-by: Christophe Bedard --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c607c89..cb3a245 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,8 @@ variables: DOCKER_DRIVER: overlay2 PACKAGES_LIST: ros2trace tracetools tracetools_launch tracetools_read tracetools_test tracetools_trace - base_image_id: registry.gitlab.com/micro-ros/ros_tracing/ci_base - distro: foxy + BASE_IMAGE_ID: registry.gitlab.com/micro-ros/ros_tracing/ci_base + DISTRO: foxy .global_artifacts: &global_artifacts artifacts: @@ -20,7 +20,7 @@ before_script: - . /root/ws/install/local_setup.sh tracing_enabled: - image: $base_image_id:$distro + image: $BASE_IMAGE_ID:$DISTRO script: - lttng-sessiond --daemonize - colcon build --symlink-install --packages-up-to $PACKAGES_LIST @@ -31,7 +31,7 @@ tracing_enabled: <<: *global_artifacts tracing_disabled: - image: $base_image_id:$distro + image: $BASE_IMAGE_ID:$DISTRO script: - colcon build --symlink-install --cmake-args " -DTRACETOOLS_DISABLED=ON" --packages-up-to $PACKAGES_LIST - . install/local_setup.sh @@ -41,7 +41,7 @@ tracing_disabled: <<: *global_artifacts no_lttng: - image: $base_image_id:$distro-base + image: $BASE_IMAGE_ID:$DISTRO-base script: - colcon build --symlink-install --packages-up-to $PACKAGES_LIST - . install/local_setup.sh From d1c9dfa026b3bb98b902b8e4b66151b3de70ff01 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sat, 29 Feb 2020 20:00:31 -0500 Subject: [PATCH 2/3] Print LTTng version before building Signed-off-by: Christophe Bedard --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb3a245..2a3a45b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,7 @@ before_script: tracing_enabled: image: $BASE_IMAGE_ID:$DISTRO script: + - lttng --version && apt list lttng-tools liblttng-ust-dev python3-lttng python3-babeltrace - lttng-sessiond --daemonize - colcon build --symlink-install --packages-up-to $PACKAGES_LIST - . install/local_setup.sh From 35c8481b99914f952d99db84d7fbdee4f2199f43 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sat, 29 Feb 2020 20:09:56 -0500 Subject: [PATCH 3/3] Use console_cohesion when building and testing Signed-off-by: Christophe Bedard --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2a3a45b..b8d1df0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,29 +24,29 @@ tracing_enabled: script: - lttng --version && apt list lttng-tools liblttng-ust-dev python3-lttng python3-babeltrace - lttng-sessiond --daemonize - - colcon build --symlink-install --packages-up-to $PACKAGES_LIST + - colcon build --symlink-install --event-handlers console_cohesion+ --packages-up-to $PACKAGES_LIST - . install/local_setup.sh - ./build/tracetools/status - - colcon test --packages-select $PACKAGES_LIST + - colcon test --event-handlers console_cohesion+ --packages-select $PACKAGES_LIST - colcon test-result --all <<: *global_artifacts tracing_disabled: image: $BASE_IMAGE_ID:$DISTRO script: - - colcon build --symlink-install --cmake-args " -DTRACETOOLS_DISABLED=ON" --packages-up-to $PACKAGES_LIST + - colcon build --symlink-install --event-handlers console_cohesion+ --cmake-args " -DTRACETOOLS_DISABLED=ON" --packages-up-to $PACKAGES_LIST - . install/local_setup.sh - (! ./build/tracetools/status) - - colcon test --packages-select $PACKAGES_LIST + - colcon test --event-handlers console_cohesion+ --packages-select $PACKAGES_LIST - colcon test-result --all <<: *global_artifacts no_lttng: image: $BASE_IMAGE_ID:$DISTRO-base script: - - colcon build --symlink-install --packages-up-to $PACKAGES_LIST + - colcon build --symlink-install --event-handlers console_cohesion+ --packages-up-to $PACKAGES_LIST - . install/local_setup.sh - (! ./build/tracetools/status) - - colcon test --packages-select $PACKAGES_LIST + - colcon test --event-handlers console_cohesion+ --packages-select $PACKAGES_LIST - colcon test-result --all <<: *global_artifacts