Merge branch 'optimize-ci' into 'master'

Optimize CI

See merge request ros_tracing/ros2_tracing!23
This commit is contained in:
Christophe Bedard 2019-06-25 11:19:11 +00:00
commit dc79af9c84
4 changed files with 34 additions and 24 deletions

View file

@ -2,37 +2,35 @@ image: ros:dashing-ros-base-bionic
variables:
DOCKER_DRIVER: overlay2
GIT_CLONE_PATH: $CI_BUILDS_DIR/src/$CI_PROJECT_NAME/
PACKAGES_LIST: ros2trace tracetools tracetools_launch tracetools_read tracetools_test tracetools_trace
before_script:
- cd $CI_BUILDS_DIR
- vcs import < instrumentation.repos
- vcs import < ci_source_deps.repos
- apt-get update
- apt-get install wget
- wget -q https://raw.githubusercontent.com/ros2/ros2/master/ros2.repos
- vcs import src < ros2.repos
- rm -rf src/ros2/rcl/ src/ros2/rclcpp/
- git clone -b instrumentation --single-branch https://$DEPLOY_USERNAME_RCL:$DEPLOY_TOKEN_RCL@gitlab.com/boschresearch/ros-wg/tracing/rcl.git
- git clone -b instrumentation --single-branch https://$DEPLOY_USERNAME_RCLCPP:$DEPLOY_TOKEN_RCLCPP@gitlab.com/boschresearch/ros-wg/tracing/rclcpp.git
- apt-get install --no-install-recommends -y libasio-dev libtinyxml2-dev
- rosdep update
- rosdep install --from-paths src --ignore-src --rosdistro dashing -y --skip-keys "console_bridge fastcdr fastrtps libopensplice67 libopensplice69 rti-connext-dds-5.3.1 urdfdom_headers"
- export RTI_NC_LICENSE_ACCEPTED=yes
- 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"
# build:
# script:
# - colcon build --symlink-install --packages-up-to $PACKAGES_LIST
# - colcon test --packages-select $PACKAGES_LIST
# artifacts:
# paths:
# - install
# - build/*/test_results/*/*.xunit.xml
# reports:
# junit: build/*/Testing/*/Test.xml
build:
script:
- colcon build --symlink-install --packages-up-to tracetools tracetools_test
- colcon test --packages-select tracetools tracetools_test
artifacts:
paths:
- install
reports:
junit: build/*/Testing/*/Test.xml
build_enabled:
script:
- colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to tracetools tracetools_test
- colcon test --packages-select tracetools tracetools_test
- colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST
- colcon test --packages-select $PACKAGES_LIST
artifacts:
paths:
- install
- build/*/test_results/*/*.xunit.xml
reports:
junit: build/*/Testing/*/Test.xml

12
ci_source_deps.repos Normal file
View file

@ -0,0 +1,12 @@
repositories:
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

View file

@ -1,9 +1,9 @@
repositories:
ros2/rcl:
type: git
url: https://gitlab.com/boschresearch/ros-wg/tracing/rcl.git
url: https://gitlab.com/ros_tracing/rcl.git
version: instrumentation
ros2/rclcpp:
type: git
url: https://gitlab.com/boschresearch/ros-wg/tracing/rclcpp.git
url: https://gitlab.com/ros_tracing/rclcpp.git
version: instrumentation

View file

@ -9,7 +9,7 @@
<license>Apache 2.0</license>
<author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
<exec_depend>python3-babeltrace</exec_depend>
<!-- <exec_depend>python3-babeltrace</exec_depend> -->
<test_depend>ament_copyright</test_depend>
<test_depend>ament_flake8</test_depend>