Skip to content

Commit 0f5b349

Browse files
committed
move populate-secrets call before setting to GOOGLE_APPLICATION_CREDENTIALS env variable
1 parent 1239c8c commit 0f5b349

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.kokoro/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ retry_with_backoff 3 10 \
3838
-T 1C
3939

4040
# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it
41+
bash .kokoro/populate-secrets.sh
4142
if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then
4243
export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS})
4344
fi
@@ -73,13 +74,12 @@ integration)
7374
graalvmA)
7475
# Run Unit and Integration Tests with Native Image
7576
echo "HELLOOOO"
76-
bash .kokoro/populate-secrets.sh
7777
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-test test -pl 'oauth2_http'
7878
RETURN_CODE=$?
7979
;;
8080
graalvmB)
8181
# Run Unit and Integration Tests with Native Image
82-
bash .kokoro/populate-secrets.sh
82+
# bash .kokoro/populate-secrets.sh
8383
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-test test -pl 'oauth2_http'
8484
RETURN_CODE=$?
8585
;;

.kokoro/populate-secrets.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ do
3030
msg "Retrieving secret ${key}"
3131
gcloud secrets versions access latest \
3232
--project cloud-devrel-kokoro-resources \
33-
--secret "${key}" > "${SECRET_LOCATION}/${key}"
33+
--secret ${key} > "${SECRET_LOCATION}/${key}"
3434
# docker run --entrypoint=gcloud \
3535
# --volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \
3636
# gcr.io/google.com/cloudsdktool/cloud-sdk \

0 commit comments

Comments
 (0)