Skip to content

Commit fad2392

Browse files
author
MarcoFalke
committed
ci: Use Ubuntu 24.04 Noble for asan
1 parent fa83b65 commit fad2392

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ env: # Global defaults
4343
# The following specific types should exist, with the following requirements:
4444
# - small: For an x86_64 machine, recommended to have 2 CPUs and 8 GB of memory.
4545
# - medium: For an x86_64 machine, recommended to have 4 CPUs and 16 GB of memory.
46-
# - mantic: For a machine running the Linux kernel shipped with exaclty Ubuntu Mantic 23.10. The machine is recommended to have 4 CPUs and 16 GB of memory.
46+
# - noble: For a machine running the Linux kernel shipped with exaclty Ubuntu Noble 24.04. The machine is recommended to have 4 CPUs and 16 GB of memory.
4747
# - arm64: For an aarch64 machine, recommended to have 2 CPUs and 8 GB of memory.
4848

4949
# https://cirrus-ci.org/guide/tips-and-tricks/#sharing-configuration-between-tasks
@@ -168,7 +168,7 @@ task:
168168
<< : *GLOBAL_TASK_TEMPLATE
169169
persistent_worker:
170170
labels:
171-
type: mantic # Must use this specific worker (needed for USDT functional tests)
171+
type: noble # Must use this specific worker (needed for USDT functional tests)
172172
env:
173173
FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
174174

ci/test/00_setup_env_native_asan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9+
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
910
# Only install BCC tracing packages in Cirrus CI.
1011
if [[ "${CIRRUS_CI}" == "true" ]]; then
1112
BPFCC_PACKAGE="bpfcc-tools linux-headers-$(uname --kernel-release)"
@@ -17,7 +18,6 @@ fi
1718

1819
export CONTAINER_NAME=ci_native_asan
1920
export PACKAGES="systemtap-sdt-dev clang-17 llvm-17 libclang-rt-17-dev python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev libboost-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE}"
20-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:23.10" # This version will reach EOL in Jul 2024, and can be replaced by "ubuntu:24.04" (or anything else that ships the wanted clang version).
2121
export NO_DEPENDS=1
2222
export GOAL="install"
2323
export BITCOIN_CONFIG="--enable-c++20 --enable-usdt --enable-zmq --with-incompatible-bdb --with-gui=qt5 \

0 commit comments

Comments
 (0)