This is an automated email from the ASF dual-hosted git repository.
kou 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 69e8a78c01 GH-42128: [Packaging][CentOS] Migrate CentOS 7 and CentOS
Stream 8 packaging jobs to use vault.centos.org (#42129)
69e8a78c01 is described below
commit 69e8a78c018da88b60f9eb2b3b45703f81f3c93d
Author: Bryce Mecum <[email protected]>
AuthorDate: Thu Jun 13 20:45:31 2024 -0800
GH-42128: [Packaging][CentOS] Migrate CentOS 7 and CentOS Stream 8
packaging jobs to use vault.centos.org (#42129)
### Rationale for this change
Fixes https://github.com/apache/arrow/issues/42128.
### What changes are included in this PR?
- Updates to the CentOS 7 and CentOS Stream 8 Dockerfiles we use in the
Crossbow packaging job to point to vault.centos.org so they continue to run now
that both distros are EOL
### Are these changes tested?
Yes, I successfully built both updated Dockerfiles locally.
### Are there any user-facing changes?
No.
* GitHub Issue: #42128
Lead-authored-by: Bryce Mecum <[email protected]>
Co-authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
---
dev/release/verify-yum.sh | 12 ++++++++++++
.../apache-arrow-release/yum/centos-7/Dockerfile | 8 ++++++++
.../apache-arrow-release/yum/centos-8-stream/Dockerfile | 8 ++++++++
.../linux-packages/apache-arrow/yum/centos-7/Dockerfile | 8 ++++++++
.../apache-arrow/yum/centos-8-stream/Dockerfile | 8 ++++++++
5 files changed, 44 insertions(+)
diff --git a/dev/release/verify-yum.sh b/dev/release/verify-yum.sh
index a3904169bb..aad82af21f 100755
--- a/dev/release/verify-yum.sh
+++ b/dev/release/verify-yum.sh
@@ -64,6 +64,16 @@ 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
@@ -99,6 +109,7 @@ case "${distribution}-${distribution_version}" in
uninstall_command="yum remove -y"
clean_command="yum clean"
info_command="yum info"
+ fix_eol_repositories
;;
centos-8)
distribution_prefix="centos"
@@ -106,6 +117,7 @@ case "${distribution}-${distribution_version}" in
ruby_devel_packages+=(redhat-rpm-config)
install_command="dnf install -y --enablerepo=powertools"
info_command="dnf info --enablerepo=powertools"
+ fix_eol_repositories
;;
centos-*)
distribution_prefix="centos"
diff --git
a/dev/tasks/linux-packages/apache-arrow-release/yum/centos-7/Dockerfile
b/dev/tasks/linux-packages/apache-arrow-release/yum/centos-7/Dockerfile
index 236b0e2972..2634e7a0d3 100644
--- a/dev/tasks/linux-packages/apache-arrow-release/yum/centos-7/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow-release/yum/centos-7/Dockerfile
@@ -19,6 +19,14 @@ FROM centos:7
ARG DEBUG
+# GH-42128
+# Switch repos to point to to vault.centos.org because Centos Stream 8 is EOL
+RUN sed -i \
+ -e 's/^mirrorlist/#mirrorlist/' \
+ -e 's/^#baseurl/baseurl/' \
+ -e 's/mirror\.centos\.org/vault.centos.org/' \
+ /etc/yum.repos.d/*.repo
+
RUN \
quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \
yum install -y ${quiet} \
diff --git
a/dev/tasks/linux-packages/apache-arrow-release/yum/centos-8-stream/Dockerfile
b/dev/tasks/linux-packages/apache-arrow-release/yum/centos-8-stream/Dockerfile
index 11d7ad0ee7..65b6cb0ffb 100644
---
a/dev/tasks/linux-packages/apache-arrow-release/yum/centos-8-stream/Dockerfile
+++
b/dev/tasks/linux-packages/apache-arrow-release/yum/centos-8-stream/Dockerfile
@@ -19,6 +19,14 @@ FROM quay.io/centos/centos:stream8
ARG DEBUG
+# GH-42128
+# Switch repos to point to to vault.centos.org because Centos Stream 8 is EOL
+RUN sed -i \
+ -e 's/^mirrorlist/#mirrorlist/' \
+ -e 's/^#baseurl/baseurl/' \
+ -e 's/mirror\.centos\.org/vault.centos.org/' \
+ /etc/yum.repos.d/*.repo
+
RUN \
quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \
dnf install --enablerepo=powertools -y ${quiet} \
diff --git a/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile
b/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile
index 3c52a5663f..8c029d87c2 100644
--- a/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile
@@ -23,6 +23,14 @@ ENV \
ARG DEBUG
+# GH-42128
+# Switch repos to point to to vault.centos.org because Centos 7 is EOL
+RUN sed -i \
+ -e 's/^mirrorlist/#mirrorlist/' \
+ -e 's/^#baseurl/baseurl/' \
+ -e 's/mirror\.centos\.org/vault.centos.org/' \
+ /etc/yum.repos.d/*.repo
+
RUN \
quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \
yum update -y ${quiet} && \
diff --git
a/dev/tasks/linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile
b/dev/tasks/linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile
index acc29d3e37..ce0a26a0e4 100644
--- a/dev/tasks/linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile
@@ -20,6 +20,14 @@ FROM ${FROM}
ARG DEBUG
+# GH-42128
+# Switch repos to point to to vault.centos.org because Centos Stream 8 is EOL
+RUN sed -i \
+ -e 's/^mirrorlist/#mirrorlist/' \
+ -e 's/^#baseurl/baseurl/' \
+ -e 's/mirror\.centos\.org/vault.centos.org/' \
+ /etc/yum.repos.d/*.repo
+
RUN \
quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \
dnf install -y ${quiet} epel-release && \
