Skip to content

Commit

Permalink
GH-45508: [CI][R] Remove Ubuntu version from sanitizer jobs (#45509)
Browse files Browse the repository at this point in the history
### Rationale for this change

`ubuntu-r-sanitizer` and `ubuntu-r-valgrind` use `wch1/r-debug` as their base image.

So we can't control Ubuntu versions for them.

### What changes are included in this PR?

Remove Ubuntu version from their configurations.

### Are these changes tested?

Yes.

### Are there any user-facing changes?

No.
* GitHub Issue: #45508

Lead-authored-by: Sutou Kouhei <kou@clear-code.com>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Co-authored-by: Jonathan Keane <jkeane@gmail.com>
Signed-off-by: Sutou Kouhei <kou@clear-code.com>
  • Loading branch information
3 people authored Feb 16, 2025
1 parent 71e214c commit 4e65a94
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions dev/tasks/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ groups:
- example-*python*

r:
- test*-r-*
- test-r-*
- r-binary-packages
- r-recheck-most

Expand Down Expand Up @@ -1289,7 +1289,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:
Expand Down
12 changes: 6 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1582,19 +1582,19 @@ services:
/bin/bash -c "/arrow/ci/scripts/r_test.sh /arrow"
ubuntu-r-sanitizer:
# Only 20.04 and amd64 supported
# Only 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-r-sanitizer
cap_add:
# LeakSanitizer and gdb requires ptrace(2)
- SYS_PTRACE
build:
context: .
dockerfile: ci/docker/linux-r.dockerfile
cache_from:
- ${REPO}:amd64-ubuntu-20.04-r-sanitizer
- ${REPO}:amd64-ubuntu-r-sanitizer
args:
base: wch1/r-debug:latest
cmake: ${CMAKE}
Expand Down Expand Up @@ -1638,16 +1638,16 @@ services:
/arrow/ci/scripts/r_sanitize.sh /arrow"
ubuntu-r-valgrind:
# Only 20.04 and amd64 supported
# Only 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-r-valgrind
build:
context: .
dockerfile: ci/docker/linux-r.dockerfile
cache_from:
- ${REPO}:amd64-ubuntu-20.04-r-valgrind
- ${REPO}:amd64-ubuntu-r-valgrind
args:
base: wch1/r-debug:latest
cmake: ${CMAKE}
Expand Down

0 comments on commit 4e65a94

Please sign in to comment.