From a9bba3e2220311654427e9e858bf8de203f613ee Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Wed, 12 Jun 2024 16:27:02 -0800 Subject: [PATCH 01/11] Update Dockerfiles to use vault.centos.org --- .../linux-packages/apache-arrow/yum/centos-7/Dockerfile | 8 ++++++++ .../apache-arrow/yum/centos-8-stream/Dockerfile | 8 ++++++++ 2 files changed, 16 insertions(+) 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 3c52a5663f7..e6b6bba53f9 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 acc29d3e377..799ee284cdd 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 && \ From 6ddf821c2b622d83949f657cc8efa40ff7d881b7 Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Wed, 12 Jun 2024 20:56:10 -0800 Subject: [PATCH 02/11] Update dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile Co-authored-by: Sutou Kouhei --- .../linux-packages/apache-arrow/yum/centos-7/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 e6b6bba53f9..cc4c17e364b 100644 --- a/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile @@ -26,9 +26,9 @@ 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/' \ + -e 's/^mirrorlist/#mirrorlist/' \ + -e 's/^#baseurl/baseurl/' \ + -e 's/mirror\\.centos\\.org/vault.centos.org/' \ /etc/yum.repos.d/*.repo RUN \ From d7c85394d6df0cdea9b16f5f355178ef1322f5b8 Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Wed, 12 Jun 2024 20:56:16 -0800 Subject: [PATCH 03/11] Update dev/tasks/linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile Co-authored-by: Sutou Kouhei --- .../apache-arrow/yum/centos-8-stream/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 799ee284cdd..c6595438438 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 @@ -23,9 +23,9 @@ 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/' \ + -e 's/^mirrorlist/#mirrorlist/' \ + -e 's/^#baseurl/baseurl/' \ + -e 's/mirror\\.centos\\.org/vault.centos.org/' \ /etc/yum.repos.d/*.repo RUN \ From 50da9a97c712dafd61f1a292c404320eafffb586 Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Thu, 13 Jun 2024 04:58:12 +0000 Subject: [PATCH 04/11] Update remaining Dockerfiles --- .../apache-arrow-release/yum/centos-7/Dockerfile | 8 ++++++++ .../apache-arrow-release/yum/centos-8-stream/Dockerfile | 8 ++++++++ 2 files changed, 16 insertions(+) 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 236b0e2972d..99cac85506a 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 11d7ad0ee7b..d97d33b50ec 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} \ From 72bc29de05ba61a94101f35121f5d08fcf75387c Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Wed, 12 Jun 2024 21:37:22 -0800 Subject: [PATCH 05/11] Update dev/tasks/linux-packages/apache-arrow-release/yum/centos-7/Dockerfile Co-authored-by: Sutou Kouhei --- .../linux-packages/apache-arrow-release/yum/centos-7/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 99cac85506a..2634e7a0d31 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 @@ -24,7 +24,7 @@ ARG DEBUG RUN sed -i \ -e 's/^mirrorlist/#mirrorlist/' \ -e 's/^#baseurl/baseurl/' \ - -e 's/mirror\\.centos\\.org/vault.centos.org/' \ + -e 's/mirror\.centos\.org/vault.centos.org/' \ /etc/yum.repos.d/*.repo RUN \ From 5a8cee563a6f86df72fe89016d757a3fb1f4f9e5 Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Wed, 12 Jun 2024 21:37:27 -0800 Subject: [PATCH 06/11] Update dev/tasks/linux-packages/apache-arrow-release/yum/centos-8-stream/Dockerfile Co-authored-by: Sutou Kouhei --- .../apache-arrow-release/yum/centos-8-stream/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d97d33b50ec..65b6cb0ffb1 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 @@ -24,7 +24,7 @@ ARG DEBUG RUN sed -i \ -e 's/^mirrorlist/#mirrorlist/' \ -e 's/^#baseurl/baseurl/' \ - -e 's/mirror\\.centos\\.org/vault.centos.org/' \ + -e 's/mirror\.centos\.org/vault.centos.org/' \ /etc/yum.repos.d/*.repo RUN \ From 326a63f8e658efac71b9954ff759ceb3b95f875a Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Wed, 12 Jun 2024 21:37:33 -0800 Subject: [PATCH 07/11] Update dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile Co-authored-by: Sutou Kouhei --- dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cc4c17e364b..8c029d87c24 100644 --- a/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile @@ -28,7 +28,7 @@ ARG DEBUG RUN sed -i \ -e 's/^mirrorlist/#mirrorlist/' \ -e 's/^#baseurl/baseurl/' \ - -e 's/mirror\\.centos\\.org/vault.centos.org/' \ + -e 's/mirror\.centos\.org/vault.centos.org/' \ /etc/yum.repos.d/*.repo RUN \ From bf74e5829dac6127c9ee191efa2907aee7d48746 Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Wed, 12 Jun 2024 21:37:38 -0800 Subject: [PATCH 08/11] Update dev/tasks/linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile Co-authored-by: Sutou Kouhei --- .../linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c6595438438..ce0a26a0e46 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 @@ -25,7 +25,7 @@ ARG DEBUG RUN sed -i \ -e 's/^mirrorlist/#mirrorlist/' \ -e 's/^#baseurl/baseurl/' \ - -e 's/mirror\\.centos\\.org/vault.centos.org/' \ + -e 's/mirror\.centos\.org/vault.centos.org/' \ /etc/yum.repos.d/*.repo RUN \ From 1d4e70d74472c50d9ea77382bdf5600a8aa4459e Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Thu, 13 Jun 2024 12:23:27 -0800 Subject: [PATCH 09/11] Update verify-yum.sh --- dev/release/verify-yum.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dev/release/verify-yum.sh b/dev/release/verify-yum.sh index a3904169bbf..b65c1188435 100755 --- a/dev/release/verify-yum.sh +++ b/dev/release/verify-yum.sh @@ -63,6 +63,17 @@ install_command="dnf install -y --enablerepo=crb" uninstall_command="dnf remove -y" clean_command="dnf clean" info_command="dnf info --enablerepo=crb" +should_fix_eol_repositories=no + +# 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" @@ -99,6 +110,7 @@ case "${distribution}-${distribution_version}" in uninstall_command="yum remove -y" clean_command="yum clean" info_command="yum info" + should_fix_eol_repositories=yes ;; centos-8) distribution_prefix="centos" @@ -106,6 +118,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" + should_fix_eol_repositories=yes ;; centos-*) distribution_prefix="centos" @@ -146,6 +159,9 @@ if [ "${TYPE}" = "local" ]; then esac release_path+="/${repository_version}/$(arch)/Packages" release_path+="/apache-arrow-release-${package_version}.noarch.rpm" + if [ "${should_fix_eol_repositories}" = "yes" ]; then + fix_eol_repositories + fi ${install_command} "${release_path}" else package_version="${VERSION}" From 55d9c855543dcc3c7c42a21c8e901d3496ce61b3 Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Thu, 13 Jun 2024 13:28:19 -0800 Subject: [PATCH 10/11] Replace older version of sed command with newer --- dev/release/verify-yum.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/release/verify-yum.sh b/dev/release/verify-yum.sh index b65c1188435..a584e3420e9 100755 --- a/dev/release/verify-yum.sh +++ b/dev/release/verify-yum.sh @@ -69,9 +69,9 @@ should_fix_eol_repositories=no # 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/' \ + -e 's/^mirrorlist/#mirrorlist/' \ + -e 's/^#baseurl/baseurl/' \ + -e 's/mirror\.centos\.org/vault.centos.org/' \ /etc/yum.repos.d/*.repo } From 504a36a49c71536d0163ce7348d8eb8f7b302516 Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Thu, 13 Jun 2024 16:23:54 -0800 Subject: [PATCH 11/11] Move fix_eol_repositories inline --- dev/release/verify-yum.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dev/release/verify-yum.sh b/dev/release/verify-yum.sh index a584e3420e9..aad82af21fc 100755 --- a/dev/release/verify-yum.sh +++ b/dev/release/verify-yum.sh @@ -63,7 +63,6 @@ install_command="dnf install -y --enablerepo=crb" uninstall_command="dnf remove -y" clean_command="dnf clean" info_command="dnf info --enablerepo=crb" -should_fix_eol_repositories=no # GH-42128 # Switch all repos to point to to vault.centos.org, use for EOL distros @@ -110,7 +109,7 @@ case "${distribution}-${distribution_version}" in uninstall_command="yum remove -y" clean_command="yum clean" info_command="yum info" - should_fix_eol_repositories=yes + fix_eol_repositories ;; centos-8) distribution_prefix="centos" @@ -118,7 +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" - should_fix_eol_repositories=yes + fix_eol_repositories ;; centos-*) distribution_prefix="centos" @@ -159,9 +158,6 @@ if [ "${TYPE}" = "local" ]; then esac release_path+="/${repository_version}/$(arch)/Packages" release_path+="/apache-arrow-release-${package_version}.noarch.rpm" - if [ "${should_fix_eol_repositories}" = "yes" ]; then - fix_eol_repositories - fi ${install_command} "${release_path}" else package_version="${VERSION}"