[arrow] branch master updated: ARROW-9260: [CI] Fix non amd64 job failures with Ubuntu 14.04 and 20.04

[ko...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new b7c1999  ARROW-9260: [CI] Fix non amd64 job failures with Ubuntu 14.04 and 20.04
b7c1999 is described below

commit b7c199977d8116ad7ed01197c60cd22de6c950d3
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Mon Jun 29 06:42:56 2020 +0900

    ARROW-9260: [CI] Fix non amd64 job failures with Ubuntu 14.04 and 20.04
    
    Closes #7572 from kou/cpp-ci-arm64
    
    Authored-by: Sutou Kouhei <ko...@clear-code.com>
    Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
 .github/workflows/cpp.yml             | 3 +--
 .travis.yml                           | 3 ---
 ci/docker/ubuntu-14.04-cpp.dockerfile | 4 ++--
 ci/docker/ubuntu-18.04-cpp.dockerfile | 2 +-
 ci/docker/ubuntu-20.04-cpp.dockerfile | 4 ++--
 dev/archery/archery/cli.py            | 2 +-
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index 01edf4d..d8eab59 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -102,8 +102,7 @@ jobs:
     #         hosted machines
     name: ${{ matrix.title }}
     runs-on: ${{ matrix.runner }}
-    # ARROW-9260: Disable self-hosted builds util ARM64v8 build can be fixed
-    if: false   # github.event_name == 'push'
+    if: github.event_name == 'push'
     defaults:
       # to use certain environment variables are set by .bashrc an interactive
       # bash shell must be used
diff --git a/.travis.yml b/.travis.yml
index a066393..608fb11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,9 +56,6 @@ jobs:
         UBUNTU: "20.04"
         cares_SOURCE: "BUNDLED"
         gRPC_SOURCE: "BUNDLED"
-  allow_failures:
-    - arch: arm64
-    - arch: s390x
 
 env:
   DOCKER_BUILDKIT: 0
diff --git a/ci/docker/ubuntu-14.04-cpp.dockerfile b/ci/docker/ubuntu-14.04-cpp.dockerfile
index 2316b6e..116973e 100644
--- a/ci/docker/ubuntu-14.04-cpp.dockerfile
+++ b/ci/docker/ubuntu-14.04-cpp.dockerfile
@@ -15,8 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-ARG arch=amd64
-FROM ${arch}/ubuntu:14.04
+ARG base=amd64/ubuntu:14.04
+FROM ${base}
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
diff --git a/ci/docker/ubuntu-18.04-cpp.dockerfile b/ci/docker/ubuntu-18.04-cpp.dockerfile
index 8d3afaa..a0fe1b3 100644
--- a/ci/docker/ubuntu-18.04-cpp.dockerfile
+++ b/ci/docker/ubuntu-18.04-cpp.dockerfile
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-ARG base="amd64/ubuntu:18.04"
+ARG base=amd64/ubuntu:18.04
 FROM ${base}
 
 # pipefail is enabled for proper error detection in the `wget | apt-key add`
diff --git a/ci/docker/ubuntu-20.04-cpp.dockerfile b/ci/docker/ubuntu-20.04-cpp.dockerfile
index 2b0e32c..ce738f5 100644
--- a/ci/docker/ubuntu-20.04-cpp.dockerfile
+++ b/ci/docker/ubuntu-20.04-cpp.dockerfile
@@ -15,8 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-ARG arch=amd64
-FROM ${arch}/ubuntu:20.04
+ARG base=amd64/ubuntu:20.04
+FROM ${base}
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
diff --git a/dev/archery/archery/cli.py b/dev/archery/archery/cli.py
index 7a947df..7cb2ed2 100644
--- a/dev/archery/archery/cli.py
+++ b/dev/archery/archery/cli.py
@@ -784,7 +784,7 @@ def docker_compose_run(obj, image, command, *, env, user, force_pull,
             command = ' '.join(params + ['docker-compose'] + list(args))
             click.echo(command)
 
-        compose._execute = MethodType(_print_command, compose)
+        compose._execute_compose = MethodType(_print_command, compose)
 
     env = dict(kv.split('=', 1) for kv in env)
     try: