From d7db0decf2470163bbc086c6e3a9acae2c96b656 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sun, 11 Aug 2019 10:05:02 +0200 Subject: [PATCH 1/4] Add build job without lttng --- .gitlab-ci.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3729e1a..e09680a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,8 +3,6 @@ variables: PACKAGES_LIST: ros2trace tracetools tracetools_launch tracetools_read tracetools_test tracetools_trace base_image_id: registry.gitlab.com/micro-ros/ros_tracing/ci_base -image: $base_image_id - .global_artifacts: &global_artifacts artifacts: paths: @@ -22,6 +20,7 @@ before_script: - . /root/ws/install/local_setup.sh build_enabled: + image: $base_image_id script: - lttng-sessiond --daemonize - colcon build --symlink-install --packages-up-to $PACKAGES_LIST @@ -32,6 +31,7 @@ build_enabled: <<: *global_artifacts build: + image: $base_image_id script: - colcon build --symlink-install --cmake-args " -DTRACETOOLS_DISABLED=ON" --packages-up-to $PACKAGES_LIST - . install/local_setup.sh @@ -39,3 +39,13 @@ build: - colcon test --packages-select $PACKAGES_LIST - colcon test-result <<: *global_artifacts + +build_no_lttng: + image: $base_image_id:base + script: + - colcon build --symlink-install --packages-up-to $PACKAGES_LIST + - . install/local_setup.sh + - (! ./build/tracetools/status) + - colcon test --packages-select $PACKAGES_LIST + - colcon test-result + <<: *global_artifacts From e9f5fe3fa139c1cefa77ba181084deba96c3f684 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sun, 11 Aug 2019 10:06:13 +0200 Subject: [PATCH 2/4] Rename 'build' job to 'build_disabled' --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e09680a..dee6d2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,7 @@ build_enabled: - colcon test-result <<: *global_artifacts -build: +build_disabled: image: $base_image_id script: - colcon build --symlink-install --cmake-args " -DTRACETOOLS_DISABLED=ON" --packages-up-to $PACKAGES_LIST From b992549c9a29c8eeadd3dbffda1711a66b8d2e9e Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sun, 11 Aug 2019 11:34:28 +0200 Subject: [PATCH 3/4] Add schedule-only job that builds everything from source --- .gitlab-ci.yml | 20 ++++++++++++++++++++ all.repos | 16 ++++++++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dee6d2c..1c6c64a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,3 +49,23 @@ build_no_lttng: - colcon test --packages-select $PACKAGES_LIST - colcon test-result <<: *global_artifacts + +build_from_source: + only: + - schedules + image: $base_image_id + before_script: + - wget https://raw.githubusercontent.com/ros2/ros2/master/ros2.repos + - mkdir src/ + - vcs import src/ < ros2.repos + - rm -rf src/micro-ROS/ + - vcs import --force src/ < instrumentation.repos + - 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" + script: + - lttng-sessiond --daemonize + - colcon build --symlink-install --packages-up-to $PACKAGES_LIST + - . install/local_setup.sh + - ./build/tracetools/status + - colcon test --packages-select $PACKAGES_LIST + - colcon test-result + <<: *global_artifacts diff --git a/all.repos b/all.repos index 0c7e825..b6558d6 100644 --- a/all.repos +++ b/all.repos @@ -23,6 +23,10 @@ repositories: type: git url: https://github.com/ament/uncrustify_vendor.git version: master + eProsima/foonathan_memory_vendor: + type: git + url: https://github.com/eProsima/foonathan_memory_vendor.git + version: master eProsima/Fast-CDR: type: git url: https://github.com/eProsima/Fast-CDR.git @@ -31,6 +35,10 @@ repositories: type: git url: https://github.com/eProsima/Fast-RTPS.git version: master + micro-ROS/ros_tracing/ros2_tracing: + type: git + url: https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing.git + version: master osrf/osrf_pycommon: type: git url: https://github.com/osrf/osrf_pycommon.git @@ -135,6 +143,10 @@ repositories: type: git url: https://github.com/ros2/demos.git version: master + ros2/eigen3_cmake_module: + type: git + url: https://github.com/ros2/eigen3_cmake_module.git + version: master ros2/examples: type: git url: https://github.com/ros2/examples.git @@ -315,10 +327,6 @@ repositories: type: git url: https://github.com/ros2/tlsf.git version: master - ros2/tracing: - type: git - url: https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing.git - version: master # ros2/tutorials: # type: git # url: https://github.com/ros2/tutorials.git From 9f0fdd79bdb92f2e86a9531383a7d73a69c7cebb Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sun, 11 Aug 2019 14:14:22 +0200 Subject: [PATCH 4/4] Set 'build_no_lttng' job to scheduled only --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c6c64a..7338297 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,6 +41,8 @@ build_disabled: <<: *global_artifacts build_no_lttng: + only: + - schedules image: $base_image_id:base script: - colcon build --symlink-install --packages-up-to $PACKAGES_LIST