niklas/ros2_tracing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'do-not-source-before-testing' into 'master'

Browse source 
Simplify sourcing in CI config

See merge request micro-ROS/ros_tracing/ros2_tracing!159
This commit is contained in:
Christophe Bedard 2020-03-14 21:07:55 +00:00
commit 15e09dfb53
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -24,7 +24,7 @@ tracing_enabled:
script: script:
- lttng --version && apt list lttng-tools liblttng-ust-dev python3-lttng python3-babeltrace - 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 - colcon build --symlink-install --event-handlers console_cohesion+ --packages-up-to $PACKAGES_LIST
- . install/local_setup.sh - . install/setup.sh
- ./build/tracetools/status - ./build/tracetools/status
- colcon test --event-handlers console_cohesion+ --packages-select $PACKAGES_LIST - colcon test --event-handlers console_cohesion+ --packages-select $PACKAGES_LIST
- colcon test-result --all - colcon test-result --all
@ -34,7 +34,6 @@ tracing_disabled:
image: $BASE_IMAGE_ID:$DISTRO image: $BASE_IMAGE_ID:$DISTRO
script: script:
- colcon build --symlink-install --event-handlers console_cohesion+ --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) - (! ./build/tracetools/status)
- colcon test --event-handlers console_cohesion+ --packages-select $PACKAGES_LIST - colcon test --event-handlers console_cohesion+ --packages-select $PACKAGES_LIST
- colcon test-result --all - colcon test-result --all
@ -44,7 +43,6 @@ no_lttng:
image: $BASE_IMAGE_ID:$DISTRO-base image: $BASE_IMAGE_ID:$DISTRO-base
script: script:
- colcon build --symlink-install --event-handlers console_cohesion+ --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) - (! ./build/tracetools/status)
- colcon test --event-handlers console_cohesion+ --packages-select $PACKAGES_LIST - colcon test --event-handlers console_cohesion+ --packages-select $PACKAGES_LIST
- colcon test-result --all - colcon test-result --all