From 4eea6be7a471479f2aedacb0f1406f99bde42647 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Wed, 12 Feb 2025 16:04:47 +0900 Subject: [PATCH 1/4] GH-45508: [CI][R] Use Ubuntu 22.04 instead of 20.04 for sanitizer jobs --- docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9a969bedbe51b..0368b7e9e5ed4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1582,11 +1582,11 @@ services: /bin/bash -c "/arrow/ci/scripts/r_test.sh /arrow" ubuntu-r-sanitizer: - # Only 20.04 and amd64 supported + # Only 22.04 and amd64 supported # Usage: # docker compose build ubuntu-r-sanitizer # docker compose run ubuntu-r-sanitizer - image: ${REPO}:amd64-ubuntu-20.04-r-sanitizer + image: ${REPO}:amd64-ubuntu-22.04-r-sanitizer cap_add: # LeakSanitizer and gdb requires ptrace(2) - SYS_PTRACE @@ -1594,7 +1594,7 @@ services: context: . dockerfile: ci/docker/linux-r.dockerfile cache_from: - - ${REPO}:amd64-ubuntu-20.04-r-sanitizer + - ${REPO}:amd64-ubuntu-22.04-r-sanitizer args: base: wch1/r-debug:latest cmake: ${CMAKE} @@ -1638,16 +1638,16 @@ services: /arrow/ci/scripts/r_sanitize.sh /arrow" ubuntu-r-valgrind: - # Only 20.04 and amd64 supported + # Only 22.04 and amd64 supported # Usage: # docker compose build ubuntu-r-valgrind # docker compose run ubuntu-r-valgrind - image: ${REPO}:amd64-ubuntu-20.04-r-valgrind + image: ${REPO}:amd64-ubuntu-22.04-r-valgrind build: context: . dockerfile: ci/docker/linux-r.dockerfile cache_from: - - ${REPO}:amd64-ubuntu-20.04-r-valgrind + - ${REPO}:amd64-ubuntu-22.04-r-valgrind args: base: wch1/r-debug:latest cmake: ${CMAKE} From 1c544b94f0a29d4410989a870c82acce9a83fbc6 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Wed, 12 Feb 2025 16:11:27 +0900 Subject: [PATCH 2/4] Use consistent name --- dev/tasks/tasks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 2f12faa1c5ea2..587a120f2baea 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -90,7 +90,7 @@ groups: - example-*python* r: - - test*-r-* + - test-r-* - r-binary-packages - r-recheck-most @@ -1291,7 +1291,7 @@ tasks: r_tag: latest flags: "-e LIBARROW_MINIMAL=TRUE" - test-ubuntu-r-sanitizer: + test-r-linux-sanitizer: ci: github template: docker-tests/github.linux.yml params: From dfea3cd779c9ac36b30d3bca8ff2370ceac81bda Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Fri, 14 Feb 2025 10:20:35 +0900 Subject: [PATCH 3/4] Remove Ubuntu version Co-authored-by: Jonathan Keane --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0368b7e9e5ed4..4d1b98697c4ed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1586,7 +1586,7 @@ services: # Usage: # docker compose build ubuntu-r-sanitizer # docker compose run ubuntu-r-sanitizer - image: ${REPO}:amd64-ubuntu-22.04-r-sanitizer + image: ${REPO}:amd64-ubuntu-r-sanitizer cap_add: # LeakSanitizer and gdb requires ptrace(2) - SYS_PTRACE From 700a3dfb1d012a3134264bcb755716169fb79a0e Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Thu, 13 Feb 2025 11:15:49 +0900 Subject: [PATCH 4/4] Remove Ubuntu version --- docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4d1b98697c4ed..c4503418524c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1582,7 +1582,7 @@ services: /bin/bash -c "/arrow/ci/scripts/r_test.sh /arrow" ubuntu-r-sanitizer: - # Only 22.04 and amd64 supported + # Only amd64 supported # Usage: # docker compose build ubuntu-r-sanitizer # docker compose run ubuntu-r-sanitizer @@ -1594,7 +1594,7 @@ services: context: . dockerfile: ci/docker/linux-r.dockerfile cache_from: - - ${REPO}:amd64-ubuntu-22.04-r-sanitizer + - ${REPO}:amd64-ubuntu-r-sanitizer args: base: wch1/r-debug:latest cmake: ${CMAKE} @@ -1638,16 +1638,16 @@ services: /arrow/ci/scripts/r_sanitize.sh /arrow" ubuntu-r-valgrind: - # Only 22.04 and amd64 supported + # Only amd64 supported # Usage: # docker compose build ubuntu-r-valgrind # docker compose run ubuntu-r-valgrind - image: ${REPO}:amd64-ubuntu-22.04-r-valgrind + image: ${REPO}:amd64-ubuntu-r-valgrind build: context: . dockerfile: ci/docker/linux-r.dockerfile cache_from: - - ${REPO}:amd64-ubuntu-22.04-r-valgrind + - ${REPO}:amd64-ubuntu-r-valgrind args: base: wch1/r-debug:latest cmake: ${CMAKE}