From 85068defc8d11f85f0ce4d1e757c3d48cde113f0 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Fri, 17 Jul 2020 16:17:14 +0900 Subject: [PATCH] [Release][APT][Yum] Enable verification for arm64 binaries --- dev/release/verify-apt.sh | 20 ++++++++------------ dev/release/verify-release-candidate.sh | 10 ---------- dev/release/verify-yum.sh | 9 ++++++--- 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/dev/release/verify-apt.sh b/dev/release/verify-apt.sh index 111127954e4..1182c2b77cf 100755 --- a/dev/release/verify-apt.sh +++ b/dev/release/verify-apt.sh @@ -51,8 +51,8 @@ fi have_flight=yes have_gandiva=yes have_plasma=yes -case "${distribution}-${code_name}-$(arch)" in - debian-stretch-*) +case "${distribution}-${code_name}" in + debian-stretch) sed \ -i"" \ -e "s/ main$/ main contrib non-free/g" \ @@ -61,24 +61,20 @@ case "${distribution}-${code_name}-$(arch)" in deb http://deb.debian.org/debian ${code_name}-backports main APT_LINE ;; - debian-buster-*) + debian-buster) sed \ -i"" \ -e "s/ main$/ main contrib non-free/g" \ /etc/apt/sources.list ;; - ubuntu-xenial-x86_64) + ubuntu-xenial) have_flight=no ;; - ubuntu-xenial-aarch64) - have_flight=no - have_gandiva=no - have_plasma=no - ;; - ubuntu-bionic-aarch64) - have_plasma=no - ;; esac +if [ "$(arch)" = "aarch64" ]; then + have_gandiva=no + have_plasma=no +fi keyring_archive_base_name="apache-arrow-archive-keyring-latest-${code_name}.deb" curl \ diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh index ea1ddcd2c08..386a6ca8279 100755 --- a/dev/release/verify-release-candidate.sh +++ b/dev/release/verify-release-candidate.sh @@ -146,13 +146,6 @@ test_apt() { "arm64v8/ubuntu:eoan" \ "ubuntu:focal" \ "arm64v8/ubuntu:focal"; do \ - # We can't build some arm64 binaries by Crossbow for now. - if [ "${target}" = "arm64v8/debian:stretch" ]; then continue; fi - if [ "${target}" = "arm64v8/debian:buster" ]; then continue; fi - if [ "${target}" = "arm64v8/ubuntu:xenial" ]; then continue; fi - if [ "${target}" = "arm64v8/ubuntu:bionic" ]; then continue; fi - if [ "${target}" = "arm64v8/ubuntu:eoan" ]; then continue; fi - if [ "${target}" = "arm64v8/ubuntu:focal" ]; then continue; fi case "${target}" in arm64v8/*) if [ "$(arch)" = "aarch64" -o -e /usr/bin/qemu-aarch64-static ]; then @@ -180,9 +173,6 @@ test_yum() { "arm64v8/centos:7" \ "centos:8" \ "arm64v8/centos:8"; do - # We can't build some arm64 binaries by Crossbow for now. - if [ "${target}" = "arm64v8/centos:7" ]; then continue; fi - if [ "${target}" = "arm64v8/centos:8" ]; then continue; fi case "${target}" in arm64v8/*) if [ "$(arch)" = "aarch64" -o -e /usr/bin/qemu-aarch64-static ]; then diff --git a/dev/release/verify-yum.sh b/dev/release/verify-yum.sh index f8f95f40422..5636ce041f0 100755 --- a/dev/release/verify-yum.sh +++ b/dev/release/verify-yum.sh @@ -50,20 +50,23 @@ have_gandiva=yes have_glib=yes have_parquet=yes install_command="dnf install -y --enablerepo=PowerTools" -case "${distribution}-${distribution_version}-$(arch)" in - centos-6-*) +case "${distribution}-${distribution_version}" in + centos-6) have_flight=no have_gandiva=no have_glib=no have_parquet=no install_command="yum install -y" ;; - centos-7-*) + centos-7) have_flight=no have_gandiva=no install_command="yum install -y" ;; esac +if [ "$(arch)" = "aarch64" ]; then + have_gandiva=no +fi ${install_command} \ ${bintray_base_url}/${distribution_version}/apache-arrow-release-latest.rpm