Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/package_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ jobs:
- amazon-linux-2023-arm64
- centos-9-stream-amd64
- centos-9-stream-arm64
- centos-7-amd64
- debian-bookworm-amd64
- debian-bookworm-arm64
- debian-trixie-amd64
Expand Down
6 changes: 1 addition & 5 deletions dev/release/binary-task.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1861,7 +1861,6 @@ def available_yum_targets
["almalinux", "8"],
["amazon-linux", "2023"],
["centos", "9-stream"],
["centos", "7"],
]
end

Expand Down Expand Up @@ -2048,8 +2047,7 @@ def define_yum_rc_tasks
"almalinux-9",
"almalinux-8",
"amazon-linux-2023",
"centos-9-stream",
"centos-7"
"centos-9-stream"
# Adjust source packages directory for backward
# compatibility. We don't need this for new supported
# distribution because we don't need to care about
Expand Down Expand Up @@ -2391,8 +2389,6 @@ def yum_test_targets_default
# "amazon-linux-2023-aarch64",
"centos-9-stream",
# "centos-9-stream-aarch64",
"centos-7",
# "centos-7-aarch64",
]
end

Expand Down
3 changes: 1 addition & 2 deletions dev/release/verify-release-candidate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,7 @@ test_yum() {
"almalinux:9" \
"almalinux:8" \
"amazonlinux:2023" \
"quay.io/centos/centos:stream9" \
"centos:7"; do
"quay.io/centos/centos:stream9"; do
if ! docker run \
--platform linux/x86_64 \
--rm \
Expand Down
35 changes: 0 additions & 35 deletions dev/release/verify-yum.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,6 @@ uninstall_command="dnf remove -y"
clean_command="dnf clean"
info_command="dnf info --enablerepo=crb"

# GH-42128
# Switch all repos to point to to vault.centos.org, use for EOL distros
fix_eol_repositories() {
sed -i \
-e 's/^mirrorlist/#mirrorlist/' \
-e 's/^#baseurl/baseurl/' \
-e 's/mirror\.centos\.org/vault.centos.org/' \
/etc/yum.repos.d/*.repo
}

echo "::group::Prepare repository"

case "${distribution}-${distribution_version}" in
Expand Down Expand Up @@ -97,23 +87,6 @@ case "${distribution}-${distribution_version}" in
install_command="dnf install -y --allowerasing"
info_command="dnf info"
;;
centos-7)
distribution_prefix="centos"
cmake_package=cmake3
cmake_command=cmake3
devtoolset=11
scl_package=centos-release-scl-rh
have_arrow_libs=yes
have_flight=no
have_gandiva=no
have_ruby=no
have_vala=no
install_command="yum install -y"
uninstall_command="yum remove -y"
clean_command="yum clean"
info_command="yum info"
fix_eol_repositories
;;
centos-*)
distribution_prefix="centos"
repository_version+="-stream"
Expand Down Expand Up @@ -191,14 +164,6 @@ echo "::endgroup::"
echo "::group::Test Apache Arrow C++"
mkdir -p build
${install_command} ${enablerepo_epel} arrow-devel-${package_version}
if [ -n "${devtoolset}" ]; then
${install_command} ${scl_package}
sed -i \
-e 's/^mirrorlist/#mirrorlist/' \
-e 's/^#baseurl/baseurl/' \
-e 's/mirror\.centos\.org/vault.centos.org/' \
/etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
fi
${install_command} \
${cmake_package} \
git \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,9 @@ gpgcheck=1
enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Apache-Arrow

[apache-arrow-centos]
name=Apache Arrow for CentOS $releasever - $basearch
baseurl=https://packages.apache.org/artifactory/arrow/centos/$releasever/$basearch/
gpgcheck=1
enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Apache-Arrow

[apache-arrow-rhel]
name=Apache Arrow for RHEL $releasever - $basearch
baseurl=https://packages.apache.org/artifactory/arrow/almalinux/$releasever/$basearch/
gpgcheck=1
enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Apache-Arrow

[apache-arrow-rhel7]
name=Apache Arrow for RHEL 7 - $basearch
baseurl=https://packages.apache.org/artifactory/arrow/centos/7/$basearch/
gpgcheck=1
enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Apache-Arrow
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,8 @@
%define _amzn %{?amzn:%{amzn}}%{!?amzn:0}
%define _rhel %{?rhel:%{rhel}}%{!?rhel:0}

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

%if %{use_dnf}
%define yum_repository_enable() (dnf config-manager --set-enabled %1)
%define yum_repository_disable() (dnf config-manager --set-disabled %1)
%else
%define yum_repository_enable() (yum-config-manager --enable %1)
%define yum_repository_disable() (yum-config-manager --disable %1)
%endif

Name: @PACKAGE@
Version: @VERSION@
Release: @RELEASE@%{?dist}
Expand All @@ -45,11 +36,7 @@ BuildArch: noarch
%if %{use_epel}
Requires: epel-release
%endif
%if %{use_dnf}
Requires: dnf-command(config-manager)
%else
Requires: yum-utils
%endif

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

%post
if grep -q 'Amazon Linux release 2023' /etc/system-release 2>/dev/null; then
%{yum_repository_enable apache-arrow-amazon-linux-2023}
elif grep -q 'Red Hat Enterprise Linux Server release 7' /etc/system-release 2>/dev/null; then
%{yum_repository_enable apache-arrow-rhel7}
dnf config-manager --set-enabled apache-arrow-amazon-linux-2023
elif grep -q 'Red Hat Enterprise Linux' /etc/system-release 2>/dev/null; then
%{yum_repository_enable apache-arrow-rhel}
dnf config-manager --set-enabled apache-arrow-rhel
elif grep -q 'CentOS Stream' /etc/system-release 2>/dev/null; then
%{yum_repository_enable apache-arrow-centos-stream}
elif grep -q 'CentOS' /etc/system-release 2>/dev/null; then
%{yum_repository_enable apache-arrow-centos}
dnf config-manager --set-enabled apache-arrow-centos-stream
else
%{yum_repository_enable apache-arrow-almalinux}
dnf config-manager --set-enabled apache-arrow-almalinux
fi

%changelog
Expand Down

This file was deleted.

Loading