Skip to content

Commit

Permalink
fix the GCP credentials veariable name (#2882)
Browse files Browse the repository at this point in the history
  • Loading branch information
sharbuz authored Aug 16, 2023
1 parent e9204e1 commit b96d98f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .buildkite/hooks/pre-exit
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "fleet-server" ]]; then
fi

if [[ "$BUILDKITE_PIPELINE_SLUG" == "fleet-server" && "$BUILDKITE_STEP_KEY" == "release-test" ]]; then
unset GOOGLE_APPLICATIONS_CREDENTIALS
unset GOOGLE_APPLICATION_CREDENTIALS
cleanup
fi

if [[ "$BUILDKITE_PIPELINE_SLUG" == "fleet-server-package-mbp" ]]; then
if [[ "$BUILDKITE_STEP_KEY" == "package-x86-64" || "$BUILDKITE_STEP_KEY" == "package-arm" || "$BUILDKITE_STEP_KEY" == "dra-snapshot" && "$BUILDKITE_STEP_KEY" == "dra-staging" ]]; then
unset GOOGLE_APPLICATIONS_CREDENTIALS
unset GOOGLE_APPLICATION_CREDENTIALS
unset VAULT_ROLE_ID_SECRET
unset VAULT_ADDR_SECRET
unset VAULT_SECRET_ID_SECRET
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ google_cloud_auth() {
local secretFileLocation=$(mktemp -d -p "${WORKSPACE}" -t "${TMP_FOLDER_TEMPLATE_BASE}.XXXXXXXXX")/google-cloud-credentials.json
echo "${PRIVATE_CI_GCS_CREDENTIALS_SECRET}" > ${secretFileLocation}
gcloud auth activate-service-account --key-file ${secretFileLocation} 2> /dev/null
export GOOGLE_APPLICATIONS_CREDENTIALS=${secretFileLocation}
export GOOGLE_APPLICATION_CREDENTIALS=${secretFileLocation}
}

upload_packages_to_gcp_bucket() {
Expand Down

0 comments on commit b96d98f

Please sign in to comment.