Move build of preparatory packages into docker image.

This commit is contained in:
Ingo Lütkebohle 2019-07-03 19:07:45 +00:00
parent f2a74ccdad
commit edace42fda
2 changed files with 7 additions and 6 deletions

View file

@ -9,13 +9,8 @@ services:
- docker:dind - docker:dind
build_enabled: build_enabled:
image: $base_image_id
script: script:
- vcs import < instrumentation.repos
- vcs import < ci_source_deps.repos
- 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"
- apt-get purge -y ros-dashing-fastrtps
- lttng-sessiond --daemonize - lttng-sessiond --daemonize
- colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST - colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST
- colcon test --packages-select $PACKAGES_LIST - colcon test --packages-select $PACKAGES_LIST

View file

@ -20,3 +20,9 @@ RUN apt-get install --no-install-recommends -y \
ENV RTI_NC_LICENSE_ACCEPTED=yes ENV RTI_NC_LICENSE_ACCEPTED=yes
RUN apt-get install --no-install-recommends -y \ RUN apt-get install --no-install-recommends -y \
rti-connext-dds-5.3.1 rti-connext-dds-5.3.1
RUN vcs import < instrumentation.repos && 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 purge -y ros-dashing-fastrtps
RUN colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to rclcpp