From 1f8517f51b8382a503ba6197e694365fb8733ebd Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Tue, 9 Jul 2024 20:09:35 +0800 Subject: [PATCH 1/6] HADOOP-19222. Switch yum repo baseurl due to CentOS 7 sunset --- dev-support/docker/Dockerfile_centos_7 | 15 +++++++++++++-- .../pkg-resolver/set-vault-as-baseurl-centos.sh | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dev-support/docker/Dockerfile_centos_7 b/dev-support/docker/Dockerfile_centos_7 index ff947637a2ce2..11393a16bac16 100644 --- a/dev-support/docker/Dockerfile_centos_7 +++ b/dev-support/docker/Dockerfile_centos_7 @@ -30,6 +30,13 @@ COPY pkg-resolver pkg-resolver RUN chmod a+x pkg-resolver/*.sh pkg-resolver/*.py \ && chmod a+r pkg-resolver/*.json +###### +# Centos 7 has reached its EOL and the packages +# are no longer available on mirror.centos.org site. +# Please see https://www.centos.org/centos-linux-eol/ +###### +RUN pkg-resolver/set-vault-as-baseurl-centos.sh centos:7 + ###### # Install packages from yum ###### @@ -38,8 +45,12 @@ RUN yum update -y \ && yum groupinstall -y "Development Tools" \ && yum install -y \ centos-release-scl \ - python3 \ - && yum install -y $(pkg-resolver/resolve.py centos:7) + python3 + +# Apply the script again because centos-release-scl creates new YUM repo files +RUN pkg-resolver/set-vault-as-baseurl-centos.sh centos:7 + +RUN yum install -y $(pkg-resolver/resolve.py centos:7) # Set GCC 9 as the default C/C++ compiler RUN echo "source /opt/rh/devtoolset-9/enable" >> /etc/bashrc diff --git a/dev-support/docker/pkg-resolver/set-vault-as-baseurl-centos.sh b/dev-support/docker/pkg-resolver/set-vault-as-baseurl-centos.sh index 4be4cd956b15b..905ac5077deec 100644 --- a/dev-support/docker/pkg-resolver/set-vault-as-baseurl-centos.sh +++ b/dev-support/docker/pkg-resolver/set-vault-as-baseurl-centos.sh @@ -24,7 +24,7 @@ fi if [ "$1" == "centos:7" ] || [ "$1" == "centos:8" ]; then cd /etc/yum.repos.d/ || exit && sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && - sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* && + sed -i 's|# *baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* && yum update -y && cd /root || exit else From 9122bef9ec27d8a75b79d3f107b48b1909cc0a20 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Wed, 10 Jul 2024 11:54:42 +0800 Subject: [PATCH 2/6] fix --- dev-support/docker/Dockerfile_centos_7 | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-support/docker/Dockerfile_centos_7 b/dev-support/docker/Dockerfile_centos_7 index 11393a16bac16..b97e59969a760 100644 --- a/dev-support/docker/Dockerfile_centos_7 +++ b/dev-support/docker/Dockerfile_centos_7 @@ -50,6 +50,7 @@ RUN yum update -y \ # Apply the script again because centos-release-scl creates new YUM repo files RUN pkg-resolver/set-vault-as-baseurl-centos.sh centos:7 +# hadolint ignore=DL3008,SC2046 RUN yum install -y $(pkg-resolver/resolve.py centos:7) # Set GCC 9 as the default C/C++ compiler From 4d275390ff355fc6e31524f37569afefbcc55bd6 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Wed, 10 Jul 2024 15:57:45 +0800 Subject: [PATCH 3/6] gentler yetus --- dev-support/jenkins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-support/jenkins.sh b/dev-support/jenkins.sh index b335a65159f31..68c393e8c89e2 100644 --- a/dev-support/jenkins.sh +++ b/dev-support/jenkins.sh @@ -197,7 +197,7 @@ function run_ci() { # don't let these tests cause -1s because we aren't really paying that # much attention to them - YETUS_ARGS+=("--tests-filter=checkstyle") + YETUS_ARGS+=("--tests-filter=checkstyle,test4tests") # effectively treat dev-suport as a custom maven module YETUS_ARGS+=("--skip-dirs=dev-support") From 00fafe5b23babd9f9639bda745b26d80cff31253 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Wed, 10 Jul 2024 16:06:12 +0800 Subject: [PATCH 4/6] empty From 0a815cdb47a87928b4a098f8e05a328c1fe87ebc Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Wed, 10 Jul 2024 17:46:50 +0800 Subject: [PATCH 5/6] empty From d59e005b992fadf0fdef094dda8b0817ee13317b Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Thu, 11 Jul 2024 10:16:53 +0800 Subject: [PATCH 6/6] revert ignoring test4tests --- dev-support/jenkins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-support/jenkins.sh b/dev-support/jenkins.sh index 68c393e8c89e2..b335a65159f31 100644 --- a/dev-support/jenkins.sh +++ b/dev-support/jenkins.sh @@ -197,7 +197,7 @@ function run_ci() { # don't let these tests cause -1s because we aren't really paying that # much attention to them - YETUS_ARGS+=("--tests-filter=checkstyle,test4tests") + YETUS_ARGS+=("--tests-filter=checkstyle") # effectively treat dev-suport as a custom maven module YETUS_ARGS+=("--skip-dirs=dev-support")