This is an automated email from the ASF dual-hosted git repository. kszucs pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/arrow.git
commit c5dad4d1b7b2f37036f116ec63cb5ba1a4f853ed Author: Sutou Kouhei <[email protected]> AuthorDate: Tue Jul 21 06:54:25 2020 +0900 ARROW-9508: [Release][APT][Yum] Enable verification for arm64 binaries Closes #7791 from kou/release-verify-binaries Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]> --- 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 1111279..1182c2b 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 98c8805..e6a0284 100755 --- a/dev/release/verify-release-candidate.sh +++ b/dev/release/verify-release-candidate.sh @@ -147,13 +147,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 @@ -181,9 +174,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 f8f95f4..5636ce0 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
