Skip to content

Commit 41659b8

Browse files
authored
GH-47620: [CI][C++] Use Ubuntu 24.04 for ASAN UBSAN job (#47623)
### Rationale for this change Ubuntu 22.04 ships old Node.js (12). It's too old for Azurite. ### What changes are included in this PR? Use Ubuntu 24.04 instead of 22.04. Ubuntu 24.04 ships newer Node.js (18) that can be used for Azurite. ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * GitHub Issue: #47620 Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Raúl Cumplido <[email protected]>
1 parent 00439d1 commit 41659b8

File tree

4 files changed

+31
-37
lines changed

4 files changed

+31
-37
lines changed

.github/workflows/cpp.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ jobs:
9393
image: ubuntu-cpp-sanitizer
9494
llvm: 14
9595
runs-on: ubuntu-latest
96-
title: AMD64 Ubuntu 22.04 C++ ASAN UBSAN
97-
ubuntu: 22.04
96+
title: AMD64 Ubuntu 24.04 C++ ASAN UBSAN
97+
ubuntu: 24.04
9898
- arch: arm64v8
9999
clang-tools: 14
100100
image: ubuntu-cpp

ci/docker/ubuntu-22.04-cpp.dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,6 @@ RUN /arrow/ci/scripts/install_minio.sh latest /usr/local
173173
COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
174174
RUN /arrow/ci/scripts/install_gcs_testbench.sh default
175175

176-
COPY ci/scripts/install_azurite.sh /arrow/ci/scripts/
177-
RUN /arrow/ci/scripts/install_azurite.sh
178-
179176
COPY ci/scripts/install_ceph.sh /arrow/ci/scripts/
180177
RUN /arrow/ci/scripts/install_ceph.sh
181178

ci/scripts/cpp_test.sh

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -42,43 +42,50 @@ if [ -z "${ARROW_DEBUG_MEMORY_POOL}" ]; then
4242
export ARROW_DEBUG_MEMORY_POOL=trap
4343
fi
4444

45+
exclude_tests=()
4546
ctest_options=()
47+
if ! type azurite >/dev/null 2>&1; then
48+
exclude_tests+=("arrow-azurefs-test")
49+
fi
4650
case "$(uname)" in
4751
Linux)
4852
n_jobs=$(nproc)
4953
;;
5054
Darwin)
5155
n_jobs=$(sysctl -n hw.ncpu)
5256
# TODO: https://github.com/apache/arrow/issues/40410
53-
exclude_tests="arrow-s3fs-test"
54-
ctest_options+=(--exclude-regex "${exclude_tests}")
57+
exclude_tests+=("arrow-s3fs-test")
5558
;;
5659
MINGW*)
5760
n_jobs=${NUMBER_OF_PROCESSORS:-1}
5861
# TODO: Enable these crashed tests.
5962
# https://issues.apache.org/jira/browse/ARROW-9072
60-
exclude_tests="gandiva-binary-test"
61-
exclude_tests="${exclude_tests}|gandiva-boolean-expr-test"
62-
exclude_tests="${exclude_tests}|gandiva-date-time-test"
63-
exclude_tests="${exclude_tests}|gandiva-decimal-single-test"
64-
exclude_tests="${exclude_tests}|gandiva-decimal-test"
65-
exclude_tests="${exclude_tests}|gandiva-filter-project-test"
66-
exclude_tests="${exclude_tests}|gandiva-filter-test"
67-
exclude_tests="${exclude_tests}|gandiva-hash-test"
68-
exclude_tests="${exclude_tests}|gandiva-if-expr-test"
69-
exclude_tests="${exclude_tests}|gandiva-in-expr-test"
70-
exclude_tests="${exclude_tests}|gandiva-internals-test"
71-
exclude_tests="${exclude_tests}|gandiva-literal-test"
72-
exclude_tests="${exclude_tests}|gandiva-null-validity-test"
73-
exclude_tests="${exclude_tests}|gandiva-precompiled-test"
74-
exclude_tests="${exclude_tests}|gandiva-projector-test"
75-
exclude_tests="${exclude_tests}|gandiva-utf8-test"
76-
ctest_options+=(--exclude-regex "${exclude_tests}")
63+
exclude_tests+=("gandiva-binary-test")
64+
exclude_tests+=("gandiva-boolean-expr-test")
65+
exclude_tests+=("gandiva-date-time-test")
66+
exclude_tests+=("gandiva-decimal-single-test")
67+
exclude_tests+=("gandiva-decimal-test")
68+
exclude_tests+=("gandiva-filter-project-test")
69+
exclude_tests+=("gandiva-filter-test")
70+
exclude_tests+=("gandiva-hash-test")
71+
exclude_tests+=("gandiva-if-expr-test")
72+
exclude_tests+=("gandiva-in-expr-test")
73+
exclude_tests+=("gandiva-internals-test")
74+
exclude_tests+=("gandiva-literal-test")
75+
exclude_tests+=("gandiva-null-validity-test")
76+
exclude_tests+=("gandiva-precompiled-test")
77+
exclude_tests+=("gandiva-projector-test")
78+
exclude_tests+=("gandiva-utf8-test")
7779
;;
7880
*)
7981
n_jobs=${NPROC:-1}
8082
;;
8183
esac
84+
if [ "${#exclude_tests[@]}" -gt 0 ]; then
85+
IFS="|"
86+
ctest_options+=(--exclude-regex "${exclude_tests[*]}")
87+
unset IFS
88+
fi
8289

8390
if [ "${ARROW_EMSCRIPTEN:-OFF}" = "ON" ]; then
8491
n_jobs=1 # avoid spurious fails on emscripten due to loading too many big executables

ci/scripts/install_azurite.sh

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,9 @@
2020
set -e
2121

2222
node_version="$(node --version)"
23-
echo "node version = ${node_version}"
24-
25-
case "${node_version}" in
26-
v12*)
27-
# Pin azurite to 3.29.0 due to https://github.com/apache/arrow/issues/41505
28-
azurite_version=v3.29.0
29-
;;
30-
*)
31-
azurite_version=latest
32-
;;
33-
esac
23+
echo "Node.js version = ${node_version}"
3424

25+
azurite_version=latest
3526
case "$(uname)" in
3627
Darwin)
3728
npm install -g azurite@${azurite_version}
@@ -46,5 +37,4 @@ case "$(uname)" in
4637
which azurite
4738
;;
4839
esac
49-
50-
echo "azurite version = $(azurite --version)"
40+
echo "Azurite version = $(azurite --version)"

0 commit comments

Comments
 (0)