From 8e332ff872f63c5f3f529f9aa9f6494cf1ca35c0 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Tue, 25 Jun 2019 11:18:33 +0200 Subject: [PATCH 1/5] Make CI only build necessary packages from source --- .gitlab-ci.yml | 13 ++++--------- ci_source_deps.repos | 12 ++++++++++++ instrumentation.repos | 4 ++-- tracetools_read/package.xml | 2 +- 4 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 ci_source_deps.repos diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f2585c..8df65e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,20 +2,15 @@ image: ros:dashing-ros-base-bionic variables: DOCKER_DRIVER: overlay2 - GIT_CLONE_PATH: $CI_BUILDS_DIR/src/$CI_PROJECT_NAME/ before_script: - - cd $CI_BUILDS_DIR - 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 + - vcs import < instrumentation.repos + - vcs import < ci_source_deps.repos - 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: diff --git a/ci_source_deps.repos b/ci_source_deps.repos new file mode 100644 index 0000000..e087a48 --- /dev/null +++ b/ci_source_deps.repos @@ -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 diff --git a/instrumentation.repos b/instrumentation.repos index a03675c..c1b3d1b 100644 --- a/instrumentation.repos +++ b/instrumentation.repos @@ -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 diff --git a/tracetools_read/package.xml b/tracetools_read/package.xml index eaf6c87..4e29293 100644 --- a/tracetools_read/package.xml +++ b/tracetools_read/package.xml @@ -9,7 +9,7 @@ Apache 2.0 Christophe Bedard - python3-babeltrace + ament_copyright ament_flake8 From 735232bf8e1b68cb274b9490fbad17e8542680fc Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Tue, 25 Jun 2019 11:52:35 +0200 Subject: [PATCH 2/5] Fix test report artifacts --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8df65e4..9dfd36e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,7 @@ build: artifacts: paths: - install + - build/*/test_results/*/*.xunit.xml reports: junit: build/*/Testing/*/Test.xml @@ -29,5 +30,6 @@ build_enabled: artifacts: paths: - install + - build/*/test_results/*/*.xunit.xml reports: junit: build/*/Testing/*/Test.xml From 374d10dbf5ccdbadeb413739784dc4b31cad07c8 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Tue, 25 Jun 2019 12:03:14 +0200 Subject: [PATCH 3/5] Use packages list variable --- .gitlab-ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9dfd36e..b7f9c74 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ image: ros:dashing-ros-base-bionic variables: DOCKER_DRIVER: overlay2 + PACKAGES_LIST: ros2trace tracetools tracetools_launch tracetools_read tracetools_test tracetools_trace before_script: - apt-get update @@ -14,19 +15,19 @@ before_script: build: script: - - colcon build --symlink-install --packages-up-to tracetools tracetools_test - - colcon test --packages-select tracetools tracetools_test + - 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_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 From 126dc2af86758612b4a4a26c9015073033229d8b Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Tue, 25 Jun 2019 12:03:41 +0200 Subject: [PATCH 4/5] Disable CI job with lttng not enabled --- .gitlab-ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7f9c74..0cf58c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,16 +13,16 @@ before_script: - 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 $PACKAGES_LIST +# - colcon test --packages-select $PACKAGES_LIST +# artifacts: +# paths: +# - install +# - build/*/test_results/*/*.xunit.xml +# reports: +# junit: build/*/Testing/*/Test.xml build_enabled: script: From 342c6e7e356d1b3c66fac8a9de660297c5e83963 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Tue, 25 Jun 2019 12:04:27 +0200 Subject: [PATCH 5/5] Re-order CI script commands --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0cf58c1..9425d69 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,9 +5,9 @@ variables: PACKAGES_LIST: ros2trace tracetools tracetools_launch tracetools_read tracetools_test tracetools_trace before_script: - - apt-get update - vcs import < instrumentation.repos - vcs import < ci_source_deps.repos + - apt-get update - apt-get install --no-install-recommends -y libasio-dev libtinyxml2-dev - rosdep update - export RTI_NC_LICENSE_ACCEPTED=yes