From bd35c56932e0695d31b04bd590bcb257a13f922e Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Wed, 4 Mar 2020 10:35:15 -0800 Subject: [PATCH 1/3] Set distro name explicitly for base CI image Signed-off-by: Christophe Bedard --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 873d4e4..7fdc7fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,8 @@ variables: DOCKER_DRIVER: overlay2 PACKAGES_LIST: tracetools_analysis ros2trace_analysis - base_image_id: registry.gitlab.com/micro-ros/ros_tracing/ci_base + BASE_IMAGE_ID: registry.gitlab.com/micro-ros/ros_tracing/ci_base + DISTRO: foxy .global_artifacts: &global_artifacts artifacts: @@ -15,7 +16,7 @@ variables: - build/*/pytest.xml build: - image: $base_image_id + image: $BASE_IMAGE_ID:$DISTRO before_script: - git clone https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing.git - . /root/ws/install/local_setup.sh From 01163813b1bbc8204cfb508cec6e9ce3f649eb34 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Wed, 4 Mar 2020 10:37:13 -0800 Subject: [PATCH 2/3] Create CI config variable for setting ros2_tracing repo branch Signed-off-by: Christophe Bedard --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7fdc7fc..0055f19 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ variables: PACKAGES_LIST: tracetools_analysis ros2trace_analysis BASE_IMAGE_ID: registry.gitlab.com/micro-ros/ros_tracing/ci_base DISTRO: foxy + ROS2TRACING_BRANCH: master .global_artifacts: &global_artifacts artifacts: @@ -18,7 +19,7 @@ variables: build: image: $BASE_IMAGE_ID:$DISTRO before_script: - - git clone https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing.git + - git clone https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing.git --branch $ROS2TRACING_BRANCH - . /root/ws/install/local_setup.sh script: - colcon build --symlink-install --packages-up-to $PACKAGES_LIST From dcdbdaf68c26c5df6b794689e324ce90c2068f68 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Wed, 4 Mar 2020 10:37:30 -0800 Subject: [PATCH 3/3] Do not source before testing Signed-off-by: Christophe Bedard --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0055f19..67a8296 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,6 @@ build: - . /root/ws/install/local_setup.sh script: - colcon build --symlink-install --packages-up-to $PACKAGES_LIST - - . install/local_setup.sh - colcon test --packages-select $PACKAGES_LIST --pytest-args -o addopts= - colcon test-result --all <<: *global_artifacts