Skip to content

Commit

Permalink
Merge pull request GoogleCloudPlatform#23 from emailbob/teardown_fix
Browse files Browse the repository at this point in the history
Moving .bigqueryrc file creation to the Jenkinsfile
  • Loading branch information
chrislovecnm authored Dec 29, 2018
2 parents df28e38 + 9da5732 commit ec7e451
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 3 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ spec:
sh "gcloud config set compute/zone ${env.ZONE}"
sh "gcloud config set core/project ${env.PROJECT_ID}"
sh "gcloud config set compute/region ${env.REGION}"

// Set auth for bq so we don't get prompted
sh 'echo "credential_file=${GOOGLE_APPLICATION_CREDENTIALS}" > /home/jenkins/.bigqueryrc'
}
}
stage('Lint') {
Expand Down
3 changes: 0 additions & 3 deletions scripts/teardown.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
# shellcheck source=scripts/common.sh
source "$ROOT"/scripts/common.sh

# Set auth for bq so we don't get prompted
echo "credential_file = ${GOOGLE_APPLICATION_CREDENTIALS}" > /home/jenkins/.bigqueryrc

# We have to delete the dataset before the Terraform
# Otherwise we will run into the following error
# "google_bigquery_dataset.gke-bigquery-dataset: googleapi:
Expand Down

0 comments on commit ec7e451

Please sign in to comment.