From 88c57e72e4f729dd40da600acb0edc2f87ca71e0 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sat, 14 Mar 2020 16:53:18 -0400 Subject: [PATCH 1/2] Source setup file instead of local_setup for tracing_enabled job Signed-off-by: Christophe Bedard --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5fd37bb..e0a7301 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ tracing_enabled: script: - lttng --version && apt list lttng-tools liblttng-ust-dev python3-lttng python3-babeltrace - colcon build --symlink-install --event-handlers console_cohesion+ --packages-up-to $PACKAGES_LIST - - . install/local_setup.sh + - . install/setup.sh - ./build/tracetools/status - colcon test --event-handlers console_cohesion+ --packages-select $PACKAGES_LIST - colcon test-result --all From f1a8b7321772b952d5fd178eb6c272a72397deb6 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sat, 14 Mar 2020 16:53:45 -0400 Subject: [PATCH 2/2] Do not source before testing for other jobs Signed-off-by: Christophe Bedard --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0a7301..f00210a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,6 @@ tracing_disabled: image: $BASE_IMAGE_ID:$DISTRO script: - 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 --event-handlers console_cohesion+ --packages-select $PACKAGES_LIST - colcon test-result --all @@ -44,7 +43,6 @@ no_lttng: image: $BASE_IMAGE_ID:$DISTRO-base script: - colcon build --symlink-install --event-handlers console_cohesion+ --packages-up-to $PACKAGES_LIST - - . install/local_setup.sh - (! ./build/tracetools/status) - colcon test --event-handlers console_cohesion+ --packages-select $PACKAGES_LIST - colcon test-result --all