From 1d750dc31198140055ad2221a8a4710010e530d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Fri, 26 Apr 2024 17:53:15 +0200 Subject: [PATCH] GH-40735: [Packaging][CentOS] Drop support for CentOS 7 --- dev/release/binary-task.rb | 3 - dev/release/verify-release-candidate.sh | 10 +-- dev/release/verify-yum.sh | 16 ----- .../yum/centos-7/Dockerfile | 26 -------- .../apache-arrow/yum/centos-7/Dockerfile | 66 ------------------- dev/tasks/linux-packages/package-task.rb | 2 - dev/tasks/tasks.yml | 9 +-- .../continuous_integration/crossbow.rst | 2 +- 8 files changed, 5 insertions(+), 129 deletions(-) delete mode 100644 dev/tasks/linux-packages/apache-arrow-release/yum/centos-7/Dockerfile delete mode 100644 dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile diff --git a/dev/release/binary-task.rb b/dev/release/binary-task.rb index 8fcdcf1f5f4..197d4a3b278 100644 --- a/dev/release/binary-task.rb +++ b/dev/release/binary-task.rb @@ -1464,7 +1464,6 @@ def available_yum_targets ["amazon-linux", "2023"], ["centos", "9-stream"], ["centos", "8-stream"], - ["centos", "7"], ] end @@ -2179,8 +2178,6 @@ def yum_test_targets_default # "centos-9-stream-aarch64", "centos-8-stream", # "centos-8-stream-aarch64", - "centos-7", - # "centos-7-aarch64", ] end diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh index 95be4800f7f..3dbff13e4e4 100755 --- a/dev/release/verify-release-candidate.sh +++ b/dev/release/verify-release-candidate.sh @@ -236,8 +236,7 @@ test_yum() { "arm64v8/almalinux:8" \ "amazonlinux:2023" \ "quay.io/centos/centos:stream9" \ - "quay.io/centos/centos:stream8" \ - "centos:7"; do + "quay.io/centos/centos:stream8"; do case "${target}" in arm64v8/*) if [ "$(arch)" = "aarch64" -o -e /usr/bin/qemu-aarch64-static ]; then @@ -246,13 +245,6 @@ test_yum() { continue fi ;; - centos:7) - if [ "$(arch)" = "x86_64" ]; then - : # OK - else - continue - fi - ;; esac if ! docker run \ --rm \ diff --git a/dev/release/verify-yum.sh b/dev/release/verify-yum.sh index a3904169bbf..6e6377fadda 100755 --- a/dev/release/verify-yum.sh +++ b/dev/release/verify-yum.sh @@ -84,22 +84,6 @@ case "${distribution}-${distribution_version}" in install_command="dnf install -y" 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" - ;; centos-8) distribution_prefix="centos" repository_version+="-stream" 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 deleted file mode 100644 index 236b0e2972d..00000000000 --- a/dev/tasks/linux-packages/apache-arrow-release/yum/centos-7/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -FROM centos:7 - -ARG DEBUG - -RUN \ - quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \ - yum install -y ${quiet} \ - rpmdevtools && \ - yum clean ${quiet} all diff --git a/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile b/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile deleted file mode 100644 index 3c52a5663f7..00000000000 --- a/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -ARG FROM=centos:7 -FROM ${FROM} - -ENV \ - SCL=devtoolset-11 - -ARG DEBUG - -RUN \ - quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \ - yum update -y ${quiet} && \ - yum install -y ${quiet} \ - centos-release-scl-rh \ - epel-release && \ - yum install -y ${quiet} \ - ${SCL}-gcc-c++ \ - ${SCL}-make \ - bison \ - boost169-devel \ - brotli-devel \ - bzip2-devel \ - ccache \ - cmake3 \ - curl-devel \ - flex \ - gflags-devel \ - git \ - glog-devel \ - gobject-introspection-devel \ - json-devel \ - libzstd-devel \ - lz4-devel \ - ninja-build \ - openssl-devel \ - pkg-config \ - python36 \ - rapidjson-devel \ - rpmdevtools \ - snappy-devel \ - tar \ - thrift-devel \ - vala \ - which \ - zlib-devel && \ - yum clean ${quiet} all - -ENV \ - BOOST_INCLUDEDIR=/usr/include/boost169 \ - BOOST_LIBRARYDIR=/usr/lib64/boost169 diff --git a/dev/tasks/linux-packages/package-task.rb b/dev/tasks/linux-packages/package-task.rb index 3a9e5e48b45..53a3170407a 100644 --- a/dev/tasks/linux-packages/package-task.rb +++ b/dev/tasks/linux-packages/package-task.rb @@ -423,8 +423,6 @@ def yum_targets_default # "centos-9-stream-aarch64", "centos-8-stream", # "centos-8-stream-aarch64", - "centos-7", - # "centos-7-aarch64", ] end diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 3e7f7ea0c43..b74efaebce9 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -554,12 +554,9 @@ tasks: "almalinux-8", "amazon-linux-2023", "centos-9-stream", - "centos-8-stream", - "centos-7"] %} - {% set is_rhel7_based = (target in ["amazon-linux-2", "centos-7"]) %} - {% for architecture - in ["amd64", "arm64"] - if not (target == "centos-7" and architecture == "arm64") %} + "centos-8-stream"] %} + {% set is_rhel7_based = (target in ["amazon-linux-2"]) %} + {% for architecture in ["amd64", "arm64"] %} {{ target }}-{{ architecture }}: ci: github template: linux-packages/github.linux.yml diff --git a/docs/source/developers/continuous_integration/crossbow.rst b/docs/source/developers/continuous_integration/crossbow.rst index 50ac607f4d8..5797803651f 100644 --- a/docs/source/developers/continuous_integration/crossbow.rst +++ b/docs/source/developers/continuous_integration/crossbow.rst @@ -222,7 +222,7 @@ Run only ``conda`` package builds and a Linux one: .. code:: - $ archery crossbow submit --group conda centos-7 + $ archery crossbow submit --group conda centos-9 Run ``wheel`` builds: