From 13a3cabc2e00b5170178c584c46307dd6a10b60e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20L=C3=BCtkebohle?= Date: Fri, 5 Jul 2019 12:03:47 +0000 Subject: [PATCH 1/8] Allow building CI image based on schedule --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e047245..c82ddc6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,4 +39,5 @@ ci_base_image: - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com - docker push $base_image_id only: - - /.*docker.*/ \ No newline at end of file + - /.*docker.*/ + - scheduled \ No newline at end of file From 91a3deacec29fe4b1a2873d9fc3843680cd77a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20L=C3=BCtkebohle?= Date: Fri, 5 Jul 2019 12:09:43 +0000 Subject: [PATCH 2/8] Only do vcs after building image --- .gitlab-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c82ddc6..babfa09 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,12 +8,15 @@ variables: services: - docker:dind -before_script: - - vcs import < instrumentation.repos +stage: + - deps + - build build_enabled: image: $base_image_id + stage: build script: + - vcs import < instrumentation.repos - lttng-sessiond --daemonize - . /root/ws/install/local_setup.sh - colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST @@ -33,6 +36,7 @@ build_enabled: - /.*docker.*/ ci_base_image: + stage: deps image: docker:stable script: - docker build --tag $base_image_id -f docker-ci-base/Dockerfile . From 3261b394b416ce50df181ad89d03a82ddb3c2476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20L=C3=BCtkebohle?= Date: Fri, 5 Jul 2019 12:09:57 +0000 Subject: [PATCH 3/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index babfa09..a2ed33f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ variables: services: - docker:dind -stage: +stages: - deps - build From 9d8ab5f17ef55639f32ad1a8264b6e495f3c7a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20L=C3=BCtkebohle?= Date: Fri, 5 Jul 2019 12:59:45 +0000 Subject: [PATCH 4/8] Fix image location --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2ed33f..38b4a51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,7 @@ -image: registry.gitlab.com/ros_tracing/ros2_tracing/ci-base:latest - variables: DOCKER_DRIVER: overlay2 PACKAGES_LIST: ros2trace tracetools tracetools_launch tracetools_read tracetools_test tracetools_trace - base_image_id: registry.gitlab.com/ros_tracing/ros2_tracing/ci-base + base_image_id: registry.gitlab.com/micro-ros/ros_tracing/ros2_tracing/ci-base services: - docker:dind From 30c30a6d5842650547fbb7d3e71a5582c8d3c7b0 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Fri, 5 Jul 2019 15:31:05 +0200 Subject: [PATCH 5/8] Remove explicit on liblttng-ust --- tracetools/package.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/tracetools/package.xml b/tracetools/package.xml index e9bec26..9653d03 100644 --- a/tracetools/package.xml +++ b/tracetools/package.xml @@ -13,8 +13,6 @@ ament_cmake_ros pkg-config - liblttng-ust-dev - ament_cmake_gtest ament_lint_auto ament_lint_common From fab428b4171b8da51a4c181784c9a57455c7b354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20L=C3=BCtkebohle?= Date: Mon, 8 Jul 2019 09:01:12 +0000 Subject: [PATCH 6/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38b4a51..af9f018 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,20 +1,13 @@ variables: DOCKER_DRIVER: overlay2 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 - -services: - - docker:dind - -stages: - - deps - - build + base_image_id: registry.gitlab.com/micro-ros/ros_tracing/ci_base build_enabled: image: $base_image_id - stage: build script: - vcs import < instrumentation.repos + - rosdep install --from-paths . -i . --rosdistro dashing -y - lttng-sessiond --daemonize - . /root/ws/install/local_setup.sh - colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST @@ -30,16 +23,3 @@ build_enabled: junit: - build/*/test_results/*/*.xunit.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 \ No newline at end of file From a91897db8f8c405ecd4f97b59e01968d316a7aad Mon Sep 17 00:00:00 2001 From: "Luetkebohle Ingo (CR/AEX3)" Date: Mon, 8 Jul 2019 11:13:51 +0200 Subject: [PATCH 7/8] remove outdates files --- ci_source_deps.repos | 24 ------------------------ docker-ci-base/Dockerfile | 30 ------------------------------ 2 files changed, 54 deletions(-) delete mode 100644 ci_source_deps.repos delete mode 100644 docker-ci-base/Dockerfile diff --git a/ci_source_deps.repos b/ci_source_deps.repos deleted file mode 100644 index c6e4150..0000000 --- a/ci_source_deps.repos +++ /dev/null @@ -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 diff --git a/docker-ci-base/Dockerfile b/docker-ci-base/Dockerfile deleted file mode 100644 index 23f233f..0000000 --- a/docker-ci-base/Dockerfile +++ /dev/null @@ -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 From 28b021d1d35dee9b7f52d39b0c8ac68b4ff97313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20L=C3=BCtkebohle?= Date: Mon, 8 Jul 2019 10:20:51 +0000 Subject: [PATCH 8/8] Address split WS --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af9f018..6aedc32 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ build_enabled: image: $base_image_id script: - vcs import < instrumentation.repos - - rosdep install --from-paths . -i . --rosdistro dashing -y + - rosdep install --from-paths . -i . -i /root/ws --rosdistro dashing -y - lttng-sessiond --daemonize - . /root/ws/install/local_setup.sh - colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST