Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f9f7abd

Browse files
authoredApr 8, 2022
chore: fix nightly samples check (#1976)
* chore: fix nighly samples check * chore: test if teh new setup works * chore: add regular presubmit samples check
1 parent eab45ff commit f9f7abd

10 files changed

+7
-252
lines changed
 

‎.kokoro/continuous/java11-samples.cfg

-30
This file was deleted.

‎.kokoro/continuous/java8-samples.cfg

-33
This file was deleted.

‎.kokoro/nightly/java11-samples.cfg

-30
This file was deleted.

‎.kokoro/nightly/java8-samples.cfg

-33
This file was deleted.

‎.kokoro/presubmit/java11-samples.cfg

-30
This file was deleted.

‎.kokoro/presubmit/java8-samples.cfg

-33
This file was deleted.

‎.kokoro/presubmit/samples.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ env_vars: {
2929

3030
env_vars: {
3131
key: "SECRET_MANAGER_KEYS"
32-
value: "java-docs-samples-service-account"
32+
value: "java-docs-samples-service-account, java-bigquery-samples-secrets"
3333
}

‎.kokoro/run_samples_resource_cleanup.sh

+4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ source ${scriptDir}/common.sh
3030

3131
# Setup required env variables
3232
source ${KOKORO_GFILE_DIR}/secret_manager/java-bigquery-samples-secrets
33+
# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it
34+
if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then
35+
export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS})
36+
fi
3337
echo "********** Successfully Set All Environment Variables **********"
3438

3539
# Move into the samples directory

‎.kokoro/run_samples_tests.sh

-55
This file was deleted.

‎owlbot.py

+2-7
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,9 @@
1717
import synthtool.languages.java as java
1818

1919
java.common_templates(excludes=[
20-
'.kokoro/continuous/java8-samples.cfg',
21-
'.kokoro/continuous/java11-samples.cfg',
22-
'.kokoro/nightly/java8-samples.cfg',
23-
'.kokoro/nightly/java11-samples.cfg',
2420
'.kokoro/nightly/samples.cfg',
25-
'.kokoro/presubmit/java8-samples.cfg',
26-
'.kokoro/presubmit/java11-samples.cfg',
21+
'.kokoro/presubmit/samples.cfg',
2722
'.kokoro/dependencies.sh',
2823
'codecov.yaml',
2924
'renovate.json',
30-
])
25+
])

0 commit comments

Comments
 (0)
Failed to load comments.