Skip to content

Commit

Permalink
GH-40570: [CI] Default environment to Ubuntu 22.04 instead of 20.04 (#…
Browse files Browse the repository at this point in the history
…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 <[email protected]>"
Co-authored-by: Sutou Kouhei <[email protected]>
Co-authored-by: Raúl Cumplido <[email protected]>
Signed-off-by: Raúl Cumplido <[email protected]>
  • Loading branch information
raulcd and kou authored Sep 27, 2024
1 parent 96d61c7 commit 6f64af5
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions ci/docker/ubuntu-22.04-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ RUN apt-get update -y -q && \
bzip2 \
ca-certificates \
ccache \
ceph \
ceph-fuse \
ceph-mds \
cmake \
curl \
gdb \
Expand All @@ -91,6 +94,7 @@ RUN apt-get update -y -q && \
libprotobuf-dev \
libprotoc-dev \
libpsl-dev \
libradospp-dev \
libre2-dev \
librtmp-dev \
libsnappy-dev \
Expand All @@ -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 && \
Expand Down
7 changes: 7 additions & 0 deletions ci/docker/ubuntu-24.04-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ RUN apt-get update -y -q && \
autoconf \
ca-certificates \
ccache \
ceph \
ceph-fuse \
ceph-mds \
cmake \
curl \
gdb \
Expand All @@ -91,6 +94,7 @@ RUN apt-get update -y -q && \
libprotobuf-dev \
libprotoc-dev \
libpsl-dev \
libradospp-dev \
libre2-dev \
librtmp-dev \
libsnappy-dev \
Expand All @@ -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*
Expand Down
8 changes: 5 additions & 3 deletions dev/tasks/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 6f64af5

Please sign in to comment.