From 511559229188bdff87a00175eb7bda80a1c1e685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Tue, 2 Jul 2024 17:33:29 +0200 Subject: [PATCH 01/12] GH-43119: [CI][Packaging] Update Manylinux 2014 Centos repos that have been deprecated --- ci/docker/python-wheel-manylinux.dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/docker/python-wheel-manylinux.dockerfile b/ci/docker/python-wheel-manylinux.dockerfile index 68d4b27d2ca..66bfc2a3c94 100644 --- a/ci/docker/python-wheel-manylinux.dockerfile +++ b/ci/docker/python-wheel-manylinux.dockerfile @@ -25,6 +25,11 @@ ARG manylinux ENV MANYLINUX_VERSION=${manylinux} # Ensure dnf is installed, especially for the manylinux2014 base +RUN if [ "${MANYLINUX_VERSION}" == "2014" ]; then \ + sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \ + sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo && \ + sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo; \ + fi RUN yum install -y dnf # Install basic dependencies From 7e1783e4a398b33513337e7e74f647efc62176d5 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Wed, 3 Jul 2024 16:56:04 +0900 Subject: [PATCH 02/12] Adjust URL for SCL repository for arm64v8 --- ci/docker/python-wheel-manylinux.dockerfile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ci/docker/python-wheel-manylinux.dockerfile b/ci/docker/python-wheel-manylinux.dockerfile index 66bfc2a3c94..cb39667af1e 100644 --- a/ci/docker/python-wheel-manylinux.dockerfile +++ b/ci/docker/python-wheel-manylinux.dockerfile @@ -25,10 +25,17 @@ ARG manylinux ENV MANYLINUX_VERSION=${manylinux} # Ensure dnf is installed, especially for the manylinux2014 base -RUN if [ "${MANYLINUX_VERSION}" == "2014" ]; then \ - sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \ - sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo && \ - sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo; \ +RUN if [ "${MANYLINUX_VERSION}" = "2014" ]; then \ + sed -i \ + -e 's/^mirrorlist/#mirrorlist/' \ + -e 's/^#baseurl/baseurl/' \ + -e 's/mirror\.centos\.org/vault.centos.org/' \ + /etc/yum.repos.d/*.repo; \ + if [ "${arch}" != "amd64" ]; then \ + sed -i \ + -e 's,vault\.centos\.org/centos,vault.centos.org/altarch,' \ + /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo; \ + fi; \ fi RUN yum install -y dnf From 968c261cff0c3592c6c92ae6cf34a2f3865f3ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 3 Jul 2024 11:54:23 +0200 Subject: [PATCH 03/12] Update centos-7 dockerfile to fix failures on r-binaries too --- ci/docker/centos-7-cpp.dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ci/docker/centos-7-cpp.dockerfile b/ci/docker/centos-7-cpp.dockerfile index 8c1893cbbb2..2ae309518e8 100644 --- a/ci/docker/centos-7-cpp.dockerfile +++ b/ci/docker/centos-7-cpp.dockerfile @@ -17,6 +17,14 @@ FROM centos:centos7 +# Update mirrors to use vault.centos.org as Centos 7 +# is EOL since 2024-06-30 +RUN sed -i \ + -e 's/^mirrorlist/#mirrorlist/' \ + -e 's/^#baseurl/baseurl/' \ + -e 's/mirror\.centos\.org/vault.centos.org/' \ + /etc/yum.repos.d/*.repo + # devtoolset is required for C++17 RUN \ yum install -y \ From 62376894dcb8fceadcdaca52df325530d8581931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 3 Jul 2024 12:33:01 +0200 Subject: [PATCH 04/12] Update repos after installing other repos --- ci/docker/centos-7-cpp.dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/docker/centos-7-cpp.dockerfile b/ci/docker/centos-7-cpp.dockerfile index 2ae309518e8..cfb07070928 100644 --- a/ci/docker/centos-7-cpp.dockerfile +++ b/ci/docker/centos-7-cpp.dockerfile @@ -17,7 +17,7 @@ FROM centos:centos7 -# Update mirrors to use vault.centos.org as Centos 7 +# Update mirrors to use vault.centos.org as CentOS 7 # is EOL since 2024-06-30 RUN sed -i \ -e 's/^mirrorlist/#mirrorlist/' \ @@ -30,6 +30,11 @@ RUN \ yum install -y \ centos-release-scl \ epel-release && \ + 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 && \ yum install -y \ cmake3 \ curl \ From d35ec4e56a623c0d49e233eed8c97b6e4e2ee3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 3 Jul 2024 12:48:22 +0200 Subject: [PATCH 05/12] Add correct repo --- ci/docker/centos-7-cpp.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/centos-7-cpp.dockerfile b/ci/docker/centos-7-cpp.dockerfile index cfb07070928..5dde2e83147 100644 --- a/ci/docker/centos-7-cpp.dockerfile +++ b/ci/docker/centos-7-cpp.dockerfile @@ -34,7 +34,7 @@ RUN \ -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 && \ + /etc/yum.repos.d/CentOS-SCLo.repo && \ yum install -y \ cmake3 \ curl \ From 6d671de35af747e4bcc7ce76d3356a05b19d625b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 3 Jul 2024 13:07:58 +0200 Subject: [PATCH 06/12] Debug repo name --- ci/docker/centos-7-cpp.dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/docker/centos-7-cpp.dockerfile b/ci/docker/centos-7-cpp.dockerfile index 5dde2e83147..3e13074b9b3 100644 --- a/ci/docker/centos-7-cpp.dockerfile +++ b/ci/docker/centos-7-cpp.dockerfile @@ -26,6 +26,7 @@ RUN sed -i \ /etc/yum.repos.d/*.repo # devtoolset is required for C++17 +RUN ls -lrt /etc/yum.repos.d/ RUN \ yum install -y \ centos-release-scl \ From 9f45a4d7889bd2b4c698b8d2fe43d623c1059b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 3 Jul 2024 13:13:23 +0200 Subject: [PATCH 07/12] Better after installing the repo --- ci/docker/centos-7-cpp.dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/docker/centos-7-cpp.dockerfile b/ci/docker/centos-7-cpp.dockerfile index 3e13074b9b3..a146234c87a 100644 --- a/ci/docker/centos-7-cpp.dockerfile +++ b/ci/docker/centos-7-cpp.dockerfile @@ -26,12 +26,12 @@ RUN sed -i \ /etc/yum.repos.d/*.repo # devtoolset is required for C++17 -RUN ls -lrt /etc/yum.repos.d/ RUN \ yum install -y \ centos-release-scl \ - epel-release && \ - sed -i \ + epel-release +RUN ls -lrt /etc/yum.repos.d/ +RUN sed -i \ -e 's/^mirrorlist/#mirrorlist/' \ -e 's/^#baseurl/baseurl/' \ -e 's/mirror\.centos\.org/vault.centos.org/' \ From 52993c6596ca1844db8d110b9bf7734ed32c33f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 3 Jul 2024 13:26:27 +0200 Subject: [PATCH 08/12] Use correct SCLo repo --- ci/docker/centos-7-cpp.dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ci/docker/centos-7-cpp.dockerfile b/ci/docker/centos-7-cpp.dockerfile index a146234c87a..5b80b6bb6fe 100644 --- a/ci/docker/centos-7-cpp.dockerfile +++ b/ci/docker/centos-7-cpp.dockerfile @@ -29,13 +29,12 @@ RUN sed -i \ RUN \ yum install -y \ centos-release-scl \ - epel-release -RUN ls -lrt /etc/yum.repos.d/ -RUN sed -i \ + epel-release && \ + sed -i \ -e 's/^mirrorlist/#mirrorlist/' \ -e 's/^#baseurl/baseurl/' \ -e 's/mirror\.centos\.org/vault.centos.org/' \ - /etc/yum.repos.d/CentOS-SCLo.repo && \ + /etc/yum.repos.d/CentOS-SCLo-scl.repo && \ yum install -y \ cmake3 \ curl \ From da7455ee14e038fc8c728ef7da43fa09f50e71cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 3 Jul 2024 13:46:27 +0200 Subject: [PATCH 09/12] Add both scl and scl-rh repos --- ci/docker/centos-7-cpp.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/centos-7-cpp.dockerfile b/ci/docker/centos-7-cpp.dockerfile index 5b80b6bb6fe..ec9205607b8 100644 --- a/ci/docker/centos-7-cpp.dockerfile +++ b/ci/docker/centos-7-cpp.dockerfile @@ -34,7 +34,7 @@ RUN \ -e 's/^mirrorlist/#mirrorlist/' \ -e 's/^#baseurl/baseurl/' \ -e 's/mirror\.centos\.org/vault.centos.org/' \ - /etc/yum.repos.d/CentOS-SCLo-scl.repo && \ + /etc/yum.repos.d/CentOS-SCLo-scl*.repo && \ yum install -y \ cmake3 \ curl \ From 841db64778fbdad437eae00eb00baf1bc21a11c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 3 Jul 2024 13:46:59 +0200 Subject: [PATCH 10/12] Update ci/docker/centos-7-cpp.dockerfile Co-authored-by: Sutou Kouhei --- ci/docker/centos-7-cpp.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/centos-7-cpp.dockerfile b/ci/docker/centos-7-cpp.dockerfile index ec9205607b8..c62d7f103ca 100644 --- a/ci/docker/centos-7-cpp.dockerfile +++ b/ci/docker/centos-7-cpp.dockerfile @@ -30,7 +30,7 @@ RUN \ yum install -y \ centos-release-scl \ epel-release && \ - sed -i \ + sed -i \ -e 's/^mirrorlist/#mirrorlist/' \ -e 's/^#baseurl/baseurl/' \ -e 's/mirror\.centos\.org/vault.centos.org/' \ From 301c79d4c5d12e14a2eea045bc80e88d6e10b129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 3 Jul 2024 13:54:26 +0200 Subject: [PATCH 11/12] Debug contents of /etc/yum.repos.d/CentOS-SCLo-scl.repo and /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo to try and understand why it errors with Cannot find a valid baseurl for repo: centos-sclo-sclo --- ci/docker/centos-7-cpp.dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/docker/centos-7-cpp.dockerfile b/ci/docker/centos-7-cpp.dockerfile index c62d7f103ca..918d4c56575 100644 --- a/ci/docker/centos-7-cpp.dockerfile +++ b/ci/docker/centos-7-cpp.dockerfile @@ -35,6 +35,8 @@ RUN \ -e 's/^#baseurl/baseurl/' \ -e 's/mirror\.centos\.org/vault.centos.org/' \ /etc/yum.repos.d/CentOS-SCLo-scl*.repo && \ + cat /etc/yum.repos.d/CentOS-SCLo-scl.repo && \ + cat /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo && \ yum install -y \ cmake3 \ curl \ From feee355c9f985cfc18e9682c36877e160cf43958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 3 Jul 2024 14:12:13 +0200 Subject: [PATCH 12/12] Fix wrongly commented SCLo mirror base URL --- ci/docker/centos-7-cpp.dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/docker/centos-7-cpp.dockerfile b/ci/docker/centos-7-cpp.dockerfile index 918d4c56575..1f30eed694e 100644 --- a/ci/docker/centos-7-cpp.dockerfile +++ b/ci/docker/centos-7-cpp.dockerfile @@ -33,10 +33,9 @@ RUN \ sed -i \ -e 's/^mirrorlist/#mirrorlist/' \ -e 's/^#baseurl/baseurl/' \ + -e 's/^# baseurl/baseurl/' \ -e 's/mirror\.centos\.org/vault.centos.org/' \ /etc/yum.repos.d/CentOS-SCLo-scl*.repo && \ - cat /etc/yum.repos.d/CentOS-SCLo-scl.repo && \ - cat /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo && \ yum install -y \ cmake3 \ curl \