From 23ceacb4ac116fefa969193d36aa8f80e3afce08 Mon Sep 17 00:00:00 2001 From: Weston Pace Date: Tue, 25 Oct 2022 16:02:58 -0700 Subject: [PATCH] DO-NOT-MERGE: Skipping gcs testbench install (#20) * DO-NOT-MERGE: Skipping gcs testbench install * Disabling GCS everywhere since it fails without the test bench --- .github/workflows/cpp.yml | 2 +- ci/docker/alpine-linux-3.16-cpp.dockerfile | 2 +- ci/docker/conda-cpp.dockerfile | 2 +- ci/docker/debian-11-cpp.dockerfile | 2 +- ci/docker/fedora-35-cpp.dockerfile | 2 +- ci/docker/linux-apt-docs.dockerfile | 2 +- ci/docker/ubuntu-20.04-cpp-minimal.dockerfile | 2 +- ci/docker/ubuntu-20.04-cpp.dockerfile | 2 +- ci/docker/ubuntu-22.04-cpp-minimal.dockerfile | 2 +- ci/docker/ubuntu-22.04-cpp.dockerfile | 2 +- ci/scripts/PKGBUILD | 2 +- ci/scripts/install_gcs_testbench.sh | 2 ++ 12 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index d0cc5055deda2..f932eb9125370 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -122,7 +122,7 @@ jobs: ARROW_DATASET: ON ARROW_FLIGHT: ON ARROW_GANDIVA: ON - ARROW_GCS: ON + ARROW_GCS: OFF ARROW_HDFS: ON ARROW_HOME: /usr/local ARROW_JEMALLOC: ON diff --git a/ci/docker/alpine-linux-3.16-cpp.dockerfile b/ci/docker/alpine-linux-3.16-cpp.dockerfile index 1f4ed4c47be93..917c3942b1ff4 100644 --- a/ci/docker/alpine-linux-3.16-cpp.dockerfile +++ b/ci/docker/alpine-linux-3.16-cpp.dockerfile @@ -79,7 +79,7 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_FLIGHT=ON \ ARROW_FLIGHT_SQL=ON \ ARROW_GANDIVA=ON \ - ARROW_GCS=ON \ + ARROW_GCS=OFF \ ARROW_HOME=/usr/local \ ARROW_ORC=ON \ ARROW_PARQUET=ON \ diff --git a/ci/docker/conda-cpp.dockerfile b/ci/docker/conda-cpp.dockerfile index 688c7a4997cd4..5979ca15e881a 100644 --- a/ci/docker/conda-cpp.dockerfile +++ b/ci/docker/conda-cpp.dockerfile @@ -47,7 +47,7 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_FLIGHT=ON \ ARROW_FLIGHT_SQL=ON \ ARROW_GANDIVA=ON \ - ARROW_GCS=ON \ + ARROW_GCS=OFF \ ARROW_HOME=$CONDA_PREFIX \ ARROW_ORC=ON \ ARROW_PARQUET=ON \ diff --git a/ci/docker/debian-11-cpp.dockerfile b/ci/docker/debian-11-cpp.dockerfile index 5f9fbb2afb69c..ff21232ac385e 100644 --- a/ci/docker/debian-11-cpp.dockerfile +++ b/ci/docker/debian-11-cpp.dockerfile @@ -100,7 +100,7 @@ ENV absl_SOURCE=BUNDLED \ ARROW_DEPENDENCY_SOURCE=SYSTEM \ ARROW_FLIGHT=ON \ ARROW_GANDIVA=ON \ - ARROW_GCS=ON \ + ARROW_GCS=OFF \ ARROW_HOME=/usr/local \ ARROW_ORC=ON \ ARROW_PARQUET=ON \ diff --git a/ci/docker/fedora-35-cpp.dockerfile b/ci/docker/fedora-35-cpp.dockerfile index aeb7c5b79514d..4da57a97a2d60 100644 --- a/ci/docker/fedora-35-cpp.dockerfile +++ b/ci/docker/fedora-35-cpp.dockerfile @@ -81,7 +81,7 @@ ENV absl_SOURCE=BUNDLED \ ARROW_DATASET=ON \ ARROW_FLIGHT=ON \ ARROW_GANDIVA=ON \ - ARROW_GCS=ON \ + ARROW_GCS=OFF \ ARROW_HOME=/usr/local \ ARROW_ORC=ON \ ARROW_PARQUET=ON \ diff --git a/ci/docker/linux-apt-docs.dockerfile b/ci/docker/linux-apt-docs.dockerfile index 9b27358a69a48..ad5b47332eab8 100644 --- a/ci/docker/linux-apt-docs.dockerfile +++ b/ci/docker/linux-apt-docs.dockerfile @@ -101,7 +101,7 @@ ENV ARROW_BUILD_STATIC=OFF \ ARROW_DATASET=ON \ ARROW_FILESYSTEM=ON \ ARROW_FLIGHT=ON \ - ARROW_GCS=ON \ + ARROW_GCS=OFF \ ARROW_GLIB_VAPI=false \ ARROW_HDFS=ON \ ARROW_JSON=ON \ diff --git a/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile b/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile index ca2be2873d61f..8cadc50fe8183 100644 --- a/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile +++ b/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile @@ -78,7 +78,7 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_DATASET=ON \ ARROW_FLIGHT=ON \ ARROW_GANDIVA=ON \ - ARROW_GCS=ON \ + ARROW_GCS=OFF \ ARROW_HDFS=ON \ ARROW_HOME=/usr/local \ ARROW_INSTALL_NAME_RPATH=OFF \ diff --git a/ci/docker/ubuntu-20.04-cpp.dockerfile b/ci/docker/ubuntu-20.04-cpp.dockerfile index 1cd0581aa44bd..66016aa280b85 100644 --- a/ci/docker/ubuntu-20.04-cpp.dockerfile +++ b/ci/docker/ubuntu-20.04-cpp.dockerfile @@ -137,7 +137,7 @@ ENV absl_SOURCE=BUNDLED \ ARROW_DATASET=ON \ ARROW_FLIGHT=OFF \ ARROW_GANDIVA=ON \ - ARROW_GCS=ON \ + ARROW_GCS=OFF \ ARROW_HDFS=ON \ ARROW_HOME=/usr/local \ ARROW_INSTALL_NAME_RPATH=OFF \ diff --git a/ci/docker/ubuntu-22.04-cpp-minimal.dockerfile b/ci/docker/ubuntu-22.04-cpp-minimal.dockerfile index f0dc76c65f933..050e2085f0b23 100644 --- a/ci/docker/ubuntu-22.04-cpp-minimal.dockerfile +++ b/ci/docker/ubuntu-22.04-cpp-minimal.dockerfile @@ -78,7 +78,7 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_DATASET=ON \ ARROW_FLIGHT=ON \ ARROW_GANDIVA=ON \ - ARROW_GCS=ON \ + ARROW_GCS=OFF \ ARROW_HDFS=ON \ ARROW_HOME=/usr/local \ ARROW_INSTALL_NAME_RPATH=OFF \ diff --git a/ci/docker/ubuntu-22.04-cpp.dockerfile b/ci/docker/ubuntu-22.04-cpp.dockerfile index 4bbb5c2b31735..9d50e9a8cf331 100644 --- a/ci/docker/ubuntu-22.04-cpp.dockerfile +++ b/ci/docker/ubuntu-22.04-cpp.dockerfile @@ -165,7 +165,7 @@ ENV absl_SOURCE=BUNDLED \ ARROW_FLIGHT=ON \ ARROW_FLIGHT_SQL=ON \ ARROW_GANDIVA=ON \ - ARROW_GCS=ON \ + ARROW_GCS=OFF \ ARROW_HDFS=ON \ ARROW_HOME=/usr/local \ ARROW_INSTALL_NAME_RPATH=OFF \ diff --git a/ci/scripts/PKGBUILD b/ci/scripts/PKGBUILD index 72173d040aa25..554142533e249 100644 --- a/ci/scripts/PKGBUILD +++ b/ci/scripts/PKGBUILD @@ -87,7 +87,7 @@ build() { -DARROW_CSV=ON \ -DARROW_DATASET=ON \ -DARROW_FILESYSTEM=ON \ - -DARROW_GCS=ON \ + -DARROW_GCS=OFF \ -DARROW_HDFS=OFF \ -DARROW_JEMALLOC=OFF \ -DARROW_JSON=ON \ diff --git a/ci/scripts/install_gcs_testbench.sh b/ci/scripts/install_gcs_testbench.sh index 9a788fdfd498f..dcfa7a978e77f 100755 --- a/ci/scripts/install_gcs_testbench.sh +++ b/ci/scripts/install_gcs_testbench.sh @@ -24,6 +24,8 @@ if [ "$#" -ne 1 ]; then exit 1 fi +exit 0 + case "$(uname -m)" in aarch64|arm64|x86_64) : # OK