From 860d24dce6585e806d78f8e24edf534db52f495b Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 27 Jan 2026 14:53:20 +0100 Subject: [PATCH] GH-49024: [CI] Update Debian version in `.env` Also prune entries that are not used anymore. --- .env | 5 +- ci/docker/debian-12-cpp.dockerfile | 149 ---------------------------- ci/docker/debian-13-cpp.dockerfile | 11 +- ci/docker/linux-apt-docs.dockerfile | 8 +- cpp/src/arrow/memory_pool_test.cc | 8 +- dev/tasks/tasks.yml | 14 +-- 6 files changed, 18 insertions(+), 177 deletions(-) delete mode 100644 ci/docker/debian-12-cpp.dockerfile diff --git a/.env b/.env index 6d64d284780..2440e9b0259 100644 --- a/.env +++ b/.env @@ -52,7 +52,7 @@ ULIMIT_CORE=-1 # Default versions for platforms ALMALINUX=8 ALPINE_LINUX=3.22 -DEBIAN=12 +DEBIAN=13 FEDORA=42 UBUNTU=22.04 @@ -61,11 +61,9 @@ CLANG_TOOLS=18 CMAKE=3.26.0 CUDA=11.7.1 DASK=latest -DOTNET=8.0 GCC= HDFS=3.2.1 JDK=11 -KARTOTHEK=latest # LLVM 12 and GCC 11 reports -Wmismatched-new-delete. LLVM=18 MAVEN=3.8.7 @@ -79,7 +77,6 @@ PYTHON_IMAGE_TAG=3.10 PYTHON_ABI_TAG=cp310 R=4.5 SPARK=master -TURBODBC=latest # These correspond to images on Docker Hub that contain R, e.g. rhub/ubuntu-release:latest R_IMAGE=ubuntu-release diff --git a/ci/docker/debian-12-cpp.dockerfile b/ci/docker/debian-12-cpp.dockerfile deleted file mode 100644 index 44c845bb17e..00000000000 --- a/ci/docker/debian-12-cpp.dockerfile +++ /dev/null @@ -1,149 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -ARG arch=amd64 -FROM ${arch}/debian:12 -ARG arch - -ENV DEBIAN_FRONTEND noninteractive - -ARG llvm -RUN apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - apt-transport-https \ - ca-certificates \ - gnupg \ - lsb-release \ - wget && \ - if [ ${llvm} -ge 17 ]; then \ - wget -O /usr/share/keyrings/llvm-snapshot.asc \ - https://apt.llvm.org/llvm-snapshot.gpg.key && \ - (echo "Types: deb"; \ - echo "URIs: https://apt.llvm.org/$(lsb_release --codename --short)/"; \ - echo "Suites: llvm-toolchain-$(lsb_release --codename --short)-${llvm}"; \ - echo "Components: main"; \ - echo "Signed-By: /usr/share/keyrings/llvm-snapshot.asc") | \ - tee /etc/apt/sources.list.d/llvm.sources; \ - fi && \ - apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - autoconf \ - ccache \ - clang-${llvm} \ - cmake \ - curl \ - g++ \ - gcc \ - gdb \ - git \ - libbenchmark-dev \ - libboost-filesystem-dev \ - libboost-system-dev \ - libbrotli-dev \ - libbz2-dev \ - libc-ares-dev \ - libcurl4-openssl-dev \ - libgflags-dev \ - libgmock-dev \ - libgoogle-glog-dev \ - libgrpc++-dev \ - libidn2-dev \ - libkrb5-dev \ - libldap-dev \ - liblz4-dev \ - libnghttp2-dev \ - libprotobuf-dev \ - libprotoc-dev \ - libpsl-dev \ - libre2-dev \ - librtmp-dev \ - libsnappy-dev \ - libsqlite3-dev \ - libssh-dev \ - libssh2-1-dev \ - libssl-dev \ - libthrift-dev \ - libutf8proc-dev \ - libxml2-dev \ - libzstd-dev \ - llvm-${llvm}-dev \ - make \ - ninja-build \ - nlohmann-json3-dev \ - npm \ - patch \ - pkg-config \ - protobuf-compiler-grpc \ - python3-dev \ - python3-pip \ - python3-venv \ - rapidjson-dev \ - rsync \ - tzdata \ - zlib1g-dev && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -COPY ci/scripts/install_minio.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_minio.sh latest /usr/local - -COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_gcs_testbench.sh default - -COPY ci/scripts/install_azurite.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_azurite.sh - -COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin - -# Prioritize system packages and local installation. -# -# The following dependencies will be downloaded due to missing/invalid packages -# provided by the distribution: -# - opentelemetry-cpp-dev is not packaged -ENV ARROW_ACERO=ON \ - ARROW_AZURE=ON \ - ARROW_BUILD_TESTS=ON \ - ARROW_DATASET=ON \ - ARROW_DEPENDENCY_SOURCE=SYSTEM \ - ARROW_DATASET=ON \ - ARROW_FLIGHT=ON \ - ARROW_FLIGHT_SQL=ON \ - ARROW_GANDIVA=ON \ - ARROW_GCS=ON \ - ARROW_HOME=/usr/local \ - ARROW_JEMALLOC=ON \ - ARROW_ORC=ON \ - ARROW_PARQUET=ON \ - ARROW_S3=ON \ - ARROW_SUBSTRAIT=ON \ - ARROW_USE_CCACHE=ON \ - ARROW_WITH_BROTLI=ON \ - ARROW_WITH_BZ2=ON \ - ARROW_WITH_LZ4=ON \ - ARROW_WITH_OPENTELEMETRY=ON \ - ARROW_WITH_SNAPPY=ON \ - ARROW_WITH_ZLIB=ON \ - ARROW_WITH_ZSTD=ON \ - AWSSDK_SOURCE=BUNDLED \ - Azure_SOURCE=BUNDLED \ - google_cloud_cpp_storage_SOURCE=BUNDLED \ - opentelemetry_cpp_SOURCE=BUNDLED \ - ORC_SOURCE=BUNDLED \ - PATH=/usr/lib/ccache/:$PATH \ - PYTHON=python3 \ - xsimd_SOURCE=BUNDLED diff --git a/ci/docker/debian-13-cpp.dockerfile b/ci/docker/debian-13-cpp.dockerfile index ca96b4177ff..1ea153f6872 100644 --- a/ci/docker/debian-13-cpp.dockerfile +++ b/ci/docker/debian-13-cpp.dockerfile @@ -55,26 +55,18 @@ RUN apt-get update -y -q && \ libboost-system-dev \ libbrotli-dev \ libbz2-dev \ - libc-ares-dev \ libcurl4-openssl-dev \ libgflags-dev \ libgmock-dev \ libgoogle-glog-dev \ libgrpc++-dev \ - libidn2-dev \ - libkrb5-dev \ - libldap-dev \ liblz4-dev \ - libnghttp2-dev \ + libopentelemetry-proto-dev \ libprotobuf-dev \ libprotoc-dev \ - libpsl-dev \ libre2-dev \ - librtmp-dev \ libsnappy-dev \ libsqlite3-dev \ - libssh-dev \ - libssh2-1-dev \ libssl-dev \ libthrift-dev \ libutf8proc-dev \ @@ -96,6 +88,7 @@ RUN apt-get update -y -q && \ rapidjson-dev \ rsync \ tzdata \ + tzdata-legacy \ zlib1g-dev && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* diff --git a/ci/docker/linux-apt-docs.dockerfile b/ci/docker/linux-apt-docs.dockerfile index b9f7c716e52..52090f8bb82 100644 --- a/ci/docker/linux-apt-docs.dockerfile +++ b/ci/docker/linux-apt-docs.dockerfile @@ -31,11 +31,9 @@ RUN apt-get update -y && \ lsb-release && \ gpg --keyserver keyserver.ubuntu.com \ --recv-key 95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7 && \ - gpg --export 95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7 | \ - gpg --no-default-keyring \ - --keyring /usr/share/keyrings/cran.gpg \ - --import - && \ - echo "deb [signed-by=/usr/share/keyrings/cran.gpg] https://cloud.r-project.org/bin/linux/$(lsb_release -is | tr 'A-Z' 'a-z') $(lsb_release -cs)-cran40/" | \ + gpg --armor --export 95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7 | \ + tee /usr/share/keyrings/cran.asc && \ + echo "deb [signed-by=/usr/share/keyrings/cran.asc] https://cloud.r-project.org/bin/linux/$(lsb_release -is | tr 'A-Z' 'a-z') $(lsb_release -cs)-cran40/" | \ tee /etc/apt/sources.list.d/cran.list && \ if [ -f /etc/apt/sources.list.d/debian.sources ]; then \ sed -i \ diff --git a/cpp/src/arrow/memory_pool_test.cc b/cpp/src/arrow/memory_pool_test.cc index 20006ebeb49..0af1ed2d9ec 100644 --- a/cpp/src/arrow/memory_pool_test.cc +++ b/cpp/src/arrow/memory_pool_test.cc @@ -242,10 +242,10 @@ TEST(Jemalloc, GetAllocationStats) { // Check allocated stats change due to allocation ASSERT_NEAR(allocated - allocated0, 70000, 50000); - ASSERT_NEAR(active - active0, 100000, 90000); - ASSERT_NEAR(metadata - metadata0, 500, 460); - ASSERT_NEAR(resident - resident0, 120000, 110000); - ASSERT_NEAR(mapped - mapped0, 100000, 90000); + ASSERT_GE(active - active0, allocated - allocated0); + ASSERT_GT(metadata, metadata0); + ASSERT_GE(resident - resident0, allocated - allocated0); + ASSERT_GE(mapped - mapped0, allocated - allocated0); ASSERT_NEAR(retained - retained0, 0, 40000); ASSERT_NEAR(thread_peak_read - thread_peak_read0, 1024, 700); diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 931b6da784d..97843d2ef0c 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -451,7 +451,7 @@ tasks: flags: -e CC=gcc-14 -e CXX=g++-14 -e RapidJSON_SOURCE=BUNDLED image: ubuntu-cpp -{% for debian_version in ["12"] %} +{% for debian_version in ["13"] %} test-debian-{{ debian_version }}-cpp-amd64: ci: github template: docker-tests/github.linux.yml @@ -589,23 +589,25 @@ tasks: UBUNTU: 22.04 image: ubuntu-python-313-freethreading - test-debian-12-python-3-amd64: +{% for debian_version in ["13"] %} + test-debian-{{ debian_version }}-python-3-amd64: ci: github template: docker-tests/github.linux.yml params: env: - DEBIAN: 12 + DEBIAN: "{{ debian_version }}" image: debian-python - test-debian-12-python-3-i386: + test-debian-{{ debian_version }}-python-3-i386: ci: github template: docker-tests/github.linux.yml params: env: ARCH: i386 - DEBIAN: 12 + DEBIAN: "{{ debian_version }}" flags: "-e ARROW_S3=OFF -e ARROW_GANDIVA=OFF" image: debian-python +{% endfor %} test-ubuntu-22.04-python-3: ci: github @@ -756,7 +758,7 @@ tasks: template: r/github.macos.m1san.yml # be sure to update binary-task.rb when upgrading Debian - test-debian-12-docs: + test-debian-13-docs: ci: github template: docs/github.linux.yml params: