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

Merge branch 'master' into 19a-use-ament-cmake-ros

Browse source
This commit is contained in:
Christophe Bedard 2019-07-05 12:42:01 +02:00
commit 42f2c6929c
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -8,12 +8,18 @@ variables:
services: services:
- docker:dind - docker:dind
before_script:
- vcs import < instrumentation.repos
build_enabled: build_enabled:
image: $base_image_id image: $base_image_id
script: script:
- lttng-sessiond --daemonize - lttng-sessiond --daemonize
- . install/local_setup.sh && colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST - . /root/ws/install/local_setup.sh
- . install/local_setup.sh && colcon test --packages-select $PACKAGES_LIST - colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST
- . install/local_setup.sh
- colcon test --packages-select $PACKAGES_LIST
- colcon test-result
artifacts: artifacts:
paths: paths:
- install - install

15
docker-ci-base/Dockerfile
View file

@ -3,17 +3,16 @@ FROM ros:dashing-ros-base-bionic
RUN apt-get update RUN apt-get update
RUN apt-get install --no-install-recommends -y \ RUN apt-get install --no-install-recommends -y \
libasio-dev \ software-properties-common
libtinyxml2-dev
RUN apt-get install -y software-properties-common
RUN apt-add-repository -y ppa:lttng/ppa RUN apt-add-repository -y ppa:lttng/ppa
RUN apt-get update RUN apt-get update
RUN apt-get install --no-install-recommends -y \ RUN apt-get install --no-install-recommends -y \
libasio-dev \
libtinyxml2-dev \
lttng-tools \ lttng-tools \
lttng-modules-dkms \ lttng-modules-dkms \
liblttng-ust-dev liblttng-ust-dev \
RUN apt-get install --no-install-recommends -y \
python3-lttng \ python3-lttng \
python3-babeltrace python3-babeltrace
@ -24,8 +23,8 @@ RUN apt-get install --no-install-recommends -y \
RUN mkdir /root/ws RUN mkdir /root/ws
COPY . /root/ws COPY . /root/ws
WORKDIR /root/ws WORKDIR /root/ws
RUN vcs import < instrumentation.repos && vcs import < ci_source_deps.repos RUN vcs import < ci_source_deps.repos
RUN apt-get update && rosdep update && rosdep install --from-paths . --ignore-src --rosdistro dashing -y --skip-keys "console_bridge fastcdr fastrtps libopensplice67 libopensplice69 rti-connext-dds-5.3.1 urdfdom_headers" RUN apt-get update && rosdep update && rosdep install --from-paths . --ignore-src --rosdistro dashing -y --skip-keys "console_bridge fastcdr fastrtps libopensplice67 libopensplice69 rti-connext-dds-5.3.1 urdfdom_headers"
RUN apt-get purge -y ros-dashing-fastrtps RUN apt-get purge -y ros-dashing-fastrtps
RUN . /opt/ros/dashing/setup.sh && colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to ros2trace tracetools tracetools_launch tracetools_read tracetools_test tracetools_trace RUN . /opt/ros/dashing/setup.sh && colcon build --symlink-install