This is an automated email from the ASF dual-hosted git repository.
raulcd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 6f64af54ea GH-40570: [CI] Default environment to Ubuntu 22.04 instead
of 20.04 (#44151)
6f64af54ea is described below
commit 6f64af54ea3662b7e1685b84a81429df14beace1
Author: Raúl Cumplido <raulcumpl...@gmail.com>
AuthorDate: Fri Sep 27 17:27:46 2024 +0200
GH-40570: [CI] Default environment to Ubuntu 22.04 instead of 20.04 (#44151)
### Rationale for this change
Ubuntu 20.04 will be end of standard support on April 2025. Ubuntu 22.04
and 24.04 have been already released.
We should make our default .env to UBUNTU=22.04.
### What changes are included in this PR?
Update .env default to Ubuntu 22.04 and a couple other minor updates to use
Ubuntu 22.04
### Are these changes tested?
Yes
### Are there any user-facing changes?
No
* GitHub Issue: #40570
Lead-authored-by: "Raúl Cumplido <raulcumpl...@gmail.com>"
Co-authored-by: Sutou Kouhei <k...@clear-code.com>
Co-authored-by: Raúl Cumplido <raulcumpl...@gmail.com>
Signed-off-by: Raúl Cumplido <raulcumpl...@gmail.com>
---
.env | 2 +-
.github/workflows/python.yml | 2 +-
ci/docker/ubuntu-22.04-cpp.dockerfile | 7 +++++++
ci/docker/ubuntu-24.04-cpp.dockerfile | 7 +++++++
dev/tasks/tasks.yml | 8 +++++---
5 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/.env b/.env
index f41a142490..215aa49109 100644
--- a/.env
+++ b/.env
@@ -50,7 +50,7 @@ ALMALINUX=8
ALPINE_LINUX=3.16
DEBIAN=12
FEDORA=39
-UBUNTU=20.04
+UBUNTU=22.04
# Default versions for various dependencies
CLANG_TOOLS=14
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 5b7058fbb4..84c8a6553b 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -93,7 +93,7 @@ jobs:
python: "3.11"
env:
PYTHON: ${{ matrix.python || 3.9 }}
- UBUNTU: ${{ matrix.ubuntu || 20.04 }}
+ UBUNTU: ${{ matrix.ubuntu || 22.04 }}
PANDAS: ${{ matrix.pandas || 'latest' }}
NUMPY: ${{ matrix.numpy || 'latest' }}
steps:
diff --git a/ci/docker/ubuntu-22.04-cpp.dockerfile
b/ci/docker/ubuntu-22.04-cpp.dockerfile
index f12e7456ad..bf5a282e7b 100644
--- a/ci/docker/ubuntu-22.04-cpp.dockerfile
+++ b/ci/docker/ubuntu-22.04-cpp.dockerfile
@@ -68,6 +68,9 @@ RUN apt-get update -y -q && \
bzip2 \
ca-certificates \
ccache \
+ ceph \
+ ceph-fuse \
+ ceph-mds \
cmake \
curl \
gdb \
@@ -91,6 +94,7 @@ RUN apt-get update -y -q && \
libprotobuf-dev \
libprotoc-dev \
libpsl-dev \
+ libradospp-dev \
libre2-dev \
librtmp-dev \
libsnappy-dev \
@@ -112,10 +116,13 @@ RUN apt-get update -y -q && \
protobuf-compiler-grpc \
python3-dev \
python3-pip \
+ python3-rados \
python3-venv \
+ rados-objclass-dev \
rapidjson-dev \
rsync \
tzdata \
+ uuid-runtime \
wget \
xz-utils && \
apt-get clean && \
diff --git a/ci/docker/ubuntu-24.04-cpp.dockerfile
b/ci/docker/ubuntu-24.04-cpp.dockerfile
index 7d0772c33a..f662edc536 100644
--- a/ci/docker/ubuntu-24.04-cpp.dockerfile
+++ b/ci/docker/ubuntu-24.04-cpp.dockerfile
@@ -68,6 +68,9 @@ RUN apt-get update -y -q && \
autoconf \
ca-certificates \
ccache \
+ ceph \
+ ceph-fuse \
+ ceph-mds \
cmake \
curl \
gdb \
@@ -91,6 +94,7 @@ RUN apt-get update -y -q && \
libprotobuf-dev \
libprotoc-dev \
libpsl-dev \
+ libradospp-dev \
libre2-dev \
librtmp-dev \
libsnappy-dev \
@@ -112,11 +116,14 @@ RUN apt-get update -y -q && \
protobuf-compiler-grpc \
python3-dev \
python3-pip \
+ python3-rados \
python3-venv \
+ rados-objclass-dev \
rapidjson-dev \
rsync \
tzdata \
tzdata-legacy \
+ uuid-runtime \
wget && \
apt-get clean && \
rm -rf /var/lib/apt/lists*
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 1747ff546a..a835b22dbf 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -1118,7 +1118,7 @@ tasks:
template: docker-tests/github.linux.yml
params:
env:
- UBUNTU: 20.04
+ UBUNTU: 22.04
flags: >-
-e ARROW_AZURE=OFF
-e ARROW_GANDIVA=OFF
@@ -1188,12 +1188,12 @@ tasks:
UBUNTU: 24.04
image: ubuntu-cpp-thread-sanitizer
- test-ubuntu-20.04-cpp-minimal-with-formats:
+ test-ubuntu-24.04-cpp-minimal-with-formats:
ci: github
template: docker-tests/github.linux.yml
params:
env:
- UBUNTU: 20.04
+ UBUNTU: 24.04
flags: "-e ARROW_CSV=ON -e ARROW_PARQUET=ON"
image: ubuntu-cpp-minimal
@@ -1509,6 +1509,8 @@ tasks:
ci: github
template: docker-tests/github.cuda.yml
params:
+ env:
+ UBUNTU: 20.04
image: ubuntu-cuda-cpp
test-cuda-cpp-ubuntu-22.04-cuda-11.7.1:
