From 5ea2f1dea21e5c571e0655c96df926869fd8a005 Mon Sep 17 00:00:00 2001 From: Daniel Thorn Date: Mon, 16 May 2022 12:53:50 -0700 Subject: [PATCH] Remove redundant GOOGLE_APPLICATION_CREDENTIALS in integration (#2973) --- .circleci/config.yml | 7 ------- script/entrypoint | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fcdb83981a..82bfec5dbc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -176,16 +176,9 @@ jobs: venv/bin/pip-sync --pip-args=--no-deps requirements.txt - run: name: PyTest Integration Test - # Google's client libraries will check for - # GOOGLE_APPLICATION_CREDENTIALS - # and use a file in that location for credentials if present; - # See https://cloud.google.com/docs/authentication/production # yamllint disable rule:line-length command: | - export GOOGLE_APPLICATION_CREDENTIALS="/tmp/gcp.json" - echo "$GCLOUD_SERVICE_KEY" > "$GOOGLE_APPLICATION_CREDENTIALS" PATH="venv/bin:$PATH" script/entrypoint -m 'integration or java' -n 8 - # yamllint enable rule:line-length - save_cache: paths: - ~/.m2 diff --git a/script/entrypoint b/script/entrypoint index 883e1852eb..58315b8631 100755 --- a/script/entrypoint +++ b/script/entrypoint @@ -30,7 +30,7 @@ elif [ "$1" = "query" ]; then # For an invocation like: # query [options] FILE # we dispatch to a script that inspects metadata and emulates the following call: - # bq query [options] < FILE + # bq query [options] < FILE exec script/run_query --query_file="${@: -1}" "${@:1:$#-1}" elif [ "$XCOM_PUSH" = "true" ]; then # KubernetesPodOperator will extract the contents of /airflow/xcom/return.json as an xcom