Skip to content

Commit 2e12201

Browse files
authored
GH-40735: [Packaging][CentOS] Drop support for CentOS 7 (#48550)
### Rationale for this change There is no sponsor to maintain EOL-ed CentOS 7. ### What changes are included in this PR? Remove CentOS 7 packages related configurations. ### Are these changes tested? Yes. ### Are there any user-facing changes? Yes. * GitHub Issue: #40735 Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Raúl Cumplido <[email protected]>
1 parent 86166d5 commit 2e12201

File tree

12 files changed

+27
-296
lines changed

12 files changed

+27
-296
lines changed

.github/workflows/package_linux.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ jobs:
9595
- amazon-linux-2023-arm64
9696
- centos-9-stream-amd64
9797
- centos-9-stream-arm64
98-
- centos-7-amd64
9998
- debian-bookworm-amd64
10099
- debian-bookworm-arm64
101100
- debian-trixie-amd64

dev/release/binary-task.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1861,7 +1861,6 @@ def available_yum_targets
18611861
["almalinux", "8"],
18621862
["amazon-linux", "2023"],
18631863
["centos", "9-stream"],
1864-
["centos", "7"],
18651864
]
18661865
end
18671866

@@ -2048,8 +2047,7 @@ def define_yum_rc_tasks
20482047
"almalinux-9",
20492048
"almalinux-8",
20502049
"amazon-linux-2023",
2051-
"centos-9-stream",
2052-
"centos-7"
2050+
"centos-9-stream"
20532051
# Adjust source packages directory for backward
20542052
# compatibility. We don't need this for new supported
20552053
# distribution because we don't need to care about
@@ -2391,8 +2389,6 @@ def yum_test_targets_default
23912389
# "amazon-linux-2023-aarch64",
23922390
"centos-9-stream",
23932391
# "centos-9-stream-aarch64",
2394-
"centos-7",
2395-
# "centos-7-aarch64",
23962392
]
23972393
end
23982394

dev/release/verify-release-candidate.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,7 @@ test_yum() {
270270
"almalinux:9" \
271271
"almalinux:8" \
272272
"amazonlinux:2023" \
273-
"quay.io/centos/centos:stream9" \
274-
"centos:7"; do
273+
"quay.io/centos/centos:stream9"; do
275274
if ! docker run \
276275
--platform linux/x86_64 \
277276
--rm \

dev/release/verify-yum.sh

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,6 @@ uninstall_command="dnf remove -y"
6060
clean_command="dnf clean"
6161
info_command="dnf info --enablerepo=crb"
6262

63-
# GH-42128
64-
# Switch all repos to point to to vault.centos.org, use for EOL distros
65-
fix_eol_repositories() {
66-
sed -i \
67-
-e 's/^mirrorlist/#mirrorlist/' \
68-
-e 's/^#baseurl/baseurl/' \
69-
-e 's/mirror\.centos\.org/vault.centos.org/' \
70-
/etc/yum.repos.d/*.repo
71-
}
72-
7363
echo "::group::Prepare repository"
7464

7565
case "${distribution}-${distribution_version}" in
@@ -97,23 +87,6 @@ case "${distribution}-${distribution_version}" in
9787
install_command="dnf install -y --allowerasing"
9888
info_command="dnf info"
9989
;;
100-
centos-7)
101-
distribution_prefix="centos"
102-
cmake_package=cmake3
103-
cmake_command=cmake3
104-
devtoolset=11
105-
scl_package=centos-release-scl-rh
106-
have_arrow_libs=yes
107-
have_flight=no
108-
have_gandiva=no
109-
have_ruby=no
110-
have_vala=no
111-
install_command="yum install -y"
112-
uninstall_command="yum remove -y"
113-
clean_command="yum clean"
114-
info_command="yum info"
115-
fix_eol_repositories
116-
;;
11790
centos-*)
11891
distribution_prefix="centos"
11992
repository_version+="-stream"
@@ -191,14 +164,6 @@ echo "::endgroup::"
191164
echo "::group::Test Apache Arrow C++"
192165
mkdir -p build
193166
${install_command} ${enablerepo_epel} arrow-devel-${package_version}
194-
if [ -n "${devtoolset}" ]; then
195-
${install_command} ${scl_package}
196-
sed -i \
197-
-e 's/^mirrorlist/#mirrorlist/' \
198-
-e 's/^#baseurl/baseurl/' \
199-
-e 's/mirror\.centos\.org/vault.centos.org/' \
200-
/etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
201-
fi
202167
${install_command} \
203168
${cmake_package} \
204169
git \

dev/tasks/linux-packages/apache-arrow-release/yum/Apache-Arrow.repo

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,9 @@ gpgcheck=1
3636
enabled=0
3737
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Apache-Arrow
3838

39-
[apache-arrow-centos]
40-
name=Apache Arrow for CentOS $releasever - $basearch
41-
baseurl=https://packages.apache.org/artifactory/arrow/centos/$releasever/$basearch/
42-
gpgcheck=1
43-
enabled=0
44-
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Apache-Arrow
45-
4639
[apache-arrow-rhel]
4740
name=Apache Arrow for RHEL $releasever - $basearch
4841
baseurl=https://packages.apache.org/artifactory/arrow/almalinux/$releasever/$basearch/
4942
gpgcheck=1
5043
enabled=0
5144
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Apache-Arrow
52-
53-
[apache-arrow-rhel7]
54-
name=Apache Arrow for RHEL 7 - $basearch
55-
baseurl=https://packages.apache.org/artifactory/arrow/centos/7/$basearch/
56-
gpgcheck=1
57-
enabled=0
58-
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Apache-Arrow

dev/tasks/linux-packages/apache-arrow-release/yum/apache-arrow-release.spec.in

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,8 @@
2020
%define _amzn %{?amzn:%{amzn}}%{!?amzn:0}
2121
%define _rhel %{?rhel:%{rhel}}%{!?rhel:0}
2222

23-
%define use_dnf (%{_rhel} >= 8 || %{_amzn} >= 2023)
2423
%define use_epel (%{_amzn} < 2023)
2524

26-
%if %{use_dnf}
27-
%define yum_repository_enable() (dnf config-manager --set-enabled %1)
28-
%define yum_repository_disable() (dnf config-manager --set-disabled %1)
29-
%else
30-
%define yum_repository_enable() (yum-config-manager --enable %1)
31-
%define yum_repository_disable() (yum-config-manager --disable %1)
32-
%endif
33-
3425
Name: @PACKAGE@
3526
Version: @VERSION@
3627
Release: @RELEASE@%{?dist}
@@ -45,11 +36,7 @@ BuildArch: noarch
4536
%if %{use_epel}
4637
Requires: epel-release
4738
%endif
48-
%if %{use_dnf}
4939
Requires: dnf-command(config-manager)
50-
%else
51-
Requires: yum-utils
52-
%endif
5340

5441
%description
5542
Apache Arrow release files.
@@ -61,9 +48,9 @@ Apache Arrow release files.
6148
distribution=$(. /etc/os-release && echo "${ID}")
6249
if [ "${distribution}" = "rhel" ]; then
6350
# We use distribution version explicitly for RHEL because we can't
64-
# use symbolic link on Artifactory. CentOS and AlmaLinux use 7 and
65-
# 8 but RHEL uses 7Server and 8Server for $releasever. If we can use
66-
# symbolic link on Artifactory we can use $releasever directly.
51+
# use symbolic link on Artifactory. AlmaLinux uses 8 but RHEL uses
52+
# 8Server for $releasever. If we can use symbolic link on
53+
# Artifactory we can use $releasever directly.
6754
distribution_version=$(. /etc/os-release && echo "${VERSION_ID}")
6855
sed -i'' -e "s/\\\$releasever/${distribution_version}/g" Apache-Arrow.repo
6956
fi
@@ -88,17 +75,13 @@ rm -rf $RPM_BUILD_ROOT
8875

8976
%post
9077
if grep -q 'Amazon Linux release 2023' /etc/system-release 2>/dev/null; then
91-
%{yum_repository_enable apache-arrow-amazon-linux-2023}
92-
elif grep -q 'Red Hat Enterprise Linux Server release 7' /etc/system-release 2>/dev/null; then
93-
%{yum_repository_enable apache-arrow-rhel7}
78+
dnf config-manager --set-enabled apache-arrow-amazon-linux-2023
9479
elif grep -q 'Red Hat Enterprise Linux' /etc/system-release 2>/dev/null; then
95-
%{yum_repository_enable apache-arrow-rhel}
80+
dnf config-manager --set-enabled apache-arrow-rhel
9681
elif grep -q 'CentOS Stream' /etc/system-release 2>/dev/null; then
97-
%{yum_repository_enable apache-arrow-centos-stream}
98-
elif grep -q 'CentOS' /etc/system-release 2>/dev/null; then
99-
%{yum_repository_enable apache-arrow-centos}
82+
dnf config-manager --set-enabled apache-arrow-centos-stream
10083
else
101-
%{yum_repository_enable apache-arrow-almalinux}
84+
dnf config-manager --set-enabled apache-arrow-almalinux
10285
fi
10386

10487
%changelog

dev/tasks/linux-packages/apache-arrow-release/yum/centos-7/Dockerfile

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)