Merge branch '26-use-ci_base-docker-filer' into 'master'
Resolve "Use ci_base docker filer" Closes #26 See merge request micro-ROS/ros_tracing/ros2_tracing!54
This commit is contained in:
commit
168faf0184
3 changed files with 2 additions and 76 deletions
|
@ -1,20 +1,13 @@
|
||||||
variables:
|
variables:
|
||||||
DOCKER_DRIVER: overlay2
|
DOCKER_DRIVER: overlay2
|
||||||
PACKAGES_LIST: ros2trace tracetools tracetools_launch tracetools_read tracetools_test tracetools_trace
|
PACKAGES_LIST: ros2trace tracetools tracetools_launch tracetools_read tracetools_test tracetools_trace
|
||||||
base_image_id: registry.gitlab.com/micro-ros/ros_tracing/ros2_tracing/ci-base
|
base_image_id: registry.gitlab.com/micro-ros/ros_tracing/ci_base
|
||||||
|
|
||||||
services:
|
|
||||||
- docker:dind
|
|
||||||
|
|
||||||
stages:
|
|
||||||
- deps
|
|
||||||
- build
|
|
||||||
|
|
||||||
build_enabled:
|
build_enabled:
|
||||||
image: $base_image_id
|
image: $base_image_id
|
||||||
stage: build
|
|
||||||
script:
|
script:
|
||||||
- vcs import < instrumentation.repos
|
- vcs import < instrumentation.repos
|
||||||
|
- rosdep install --from-paths . -i . -i /root/ws --rosdistro dashing -y
|
||||||
- lttng-sessiond --daemonize
|
- lttng-sessiond --daemonize
|
||||||
- . /root/ws/install/local_setup.sh
|
- . /root/ws/install/local_setup.sh
|
||||||
- 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
|
||||||
|
@ -30,16 +23,3 @@ build_enabled:
|
||||||
junit:
|
junit:
|
||||||
- build/*/test_results/*/*.xunit.xml
|
- build/*/test_results/*/*.xunit.xml
|
||||||
- build/*/pytest.xml
|
- build/*/pytest.xml
|
||||||
except:
|
|
||||||
- /.*docker.*/
|
|
||||||
|
|
||||||
ci_base_image:
|
|
||||||
stage: deps
|
|
||||||
image: docker:stable
|
|
||||||
script:
|
|
||||||
- docker build --tag $base_image_id -f docker-ci-base/Dockerfile .
|
|
||||||
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com
|
|
||||||
- docker push $base_image_id
|
|
||||||
only:
|
|
||||||
- /.*docker.*/
|
|
||||||
- scheduled
|
|
|
@ -1,24 +0,0 @@
|
||||||
repositories:
|
|
||||||
eProsima/Fast-RTPS:
|
|
||||||
type: git
|
|
||||||
url: https://github.com/eProsima/Fast-RTPS.git
|
|
||||||
version: master
|
|
||||||
ros2/rcpputils:
|
|
||||||
type: git
|
|
||||||
url: https://github.com/ros2/rcpputils.git
|
|
||||||
version: master
|
|
||||||
ros2/rmw:
|
|
||||||
type: git
|
|
||||||
url: https://github.com/ros2/rmw.git
|
|
||||||
version: master
|
|
||||||
ros2/rmw_fastrtps:
|
|
||||||
type: git
|
|
||||||
url: https://github.com/ros2/rmw_fastrtps.git
|
|
||||||
version: master
|
|
||||||
ros2/rmw_implementation:
|
|
||||||
type: git
|
|
||||||
url: https://github.com/ros2/rmw_implementation.git
|
|
||||||
ros2/rosidl_typesupport_fastrtps:
|
|
||||||
type: git
|
|
||||||
url: https://github.com/ros2/rosidl_typesupport_fastrtps.git
|
|
||||||
version: master
|
|
|
@ -1,30 +0,0 @@
|
||||||
FROM ros:dashing-ros-base-bionic
|
|
||||||
|
|
||||||
RUN apt-get update
|
|
||||||
|
|
||||||
RUN apt-get install --no-install-recommends -y \
|
|
||||||
software-properties-common
|
|
||||||
RUN apt-add-repository -y ppa:lttng/ppa
|
|
||||||
RUN apt-get update
|
|
||||||
|
|
||||||
RUN apt-get install --no-install-recommends -y \
|
|
||||||
libasio-dev \
|
|
||||||
libtinyxml2-dev \
|
|
||||||
lttng-tools \
|
|
||||||
lttng-modules-dkms \
|
|
||||||
liblttng-ust-dev \
|
|
||||||
python3-lttng \
|
|
||||||
python3-babeltrace
|
|
||||||
|
|
||||||
ENV RTI_NC_LICENSE_ACCEPTED=yes
|
|
||||||
RUN apt-get install --no-install-recommends -y \
|
|
||||||
rti-connext-dds-5.3.1
|
|
||||||
|
|
||||||
RUN mkdir /root/ws
|
|
||||||
COPY . /root/ws
|
|
||||||
WORKDIR /root/ws
|
|
||||||
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 purge -y ros-dashing-fastrtps
|
|
||||||
|
|
||||||
RUN . /opt/ros/dashing/setup.sh && colcon build --symlink-install
|
|
Loading…
Add table
Add a link
Reference in a new issue