From 8a79deff6ac22626a0102ebd1d7f89de5a8f2edb Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Fri, 22 Sep 2023 14:17:10 -0400 Subject: [PATCH] chore: add a partial template --- .kokoro/nightly/integration.cfg | 11 +++-------- .kokoro/nightly/integration.cfg.partials.yaml | 5 +++++ owlbot.py | 4 +++- 3 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 .kokoro/nightly/integration.cfg.partials.yaml diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index b8016eda9a..a2907a257b 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -6,11 +6,6 @@ env_vars: { value: "gcr.io/cloud-devrel-kokoro-resources/java8" } -env_vars: { - key: "INTEGRATION_TEST_ARGS" - value: "-P bigtable-emulator-it,bigtable-prod-it,bigtable-prod-batch-it -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests -Dbigtable.kms_key_name=projects/gcloud-devel/locations/us-east1/keyRings/cmek-test-key-ring/cryptoKeys/cmek-test-key -Dbigtable.wait-for-cmek-key-status=true" -} - env_vars: { key: "JOB_TYPE" value: "integration" @@ -18,16 +13,16 @@ env_vars: { # TODO: remove this after we've migrated all tests and scripts env_vars: { key: "GCLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" } env_vars: { key: "GOOGLE_CLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" } env_vars: { - key: "ENABLE_BUILD_COP" + key: "ENABLE_FLAKYBOT" value: "true" } diff --git a/.kokoro/nightly/integration.cfg.partials.yaml b/.kokoro/nightly/integration.cfg.partials.yaml new file mode 100644 index 0000000000..f9b7c7f192 --- /dev/null +++ b/.kokoro/nightly/integration.cfg.partials.yaml @@ -0,0 +1,5 @@ +env_vars: +- key: INTEGRATION_TEST_ARGS + value: "-P bigtable-emulator-it,bigtable-prod-it,bigtable-prod-batch-it -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests -Dbigtable.kms_key_name=projects/gcloud-devel/locations/us-east1/keyRings/cmek-test-key-ring/cryptoKeys/cmek-test-key -Dbigtable.wait-for-cmek-key-status=true" +- key: DATASTORE_PROJECT_ID + value: java-docs-samples-testing \ No newline at end of file diff --git a/owlbot.py b/owlbot.py index 8b33b41998..070229cabf 100644 --- a/owlbot.py +++ b/owlbot.py @@ -99,7 +99,7 @@ def make_internal_only(sources): '.kokoro/presubmit/integration.cfg', '.kokoro/presubmit/graalvm-native.cfg', '.kokoro/presubmit/graalvm-native-17.cfg', - '.kokoro/nightly/integration.cfg', + # '.kokoro/nightly/integration.cfg', '.kokoro/presubmit/samples.cfg', '.kokoro/nightly/samples.cfg', # todo remove once template is updated @@ -111,3 +111,5 @@ def make_internal_only(sources): '.github/release-please.yml', 'renovate.json', ]) + +java.load_partials(['.kokoro/nightly/integration.cfg.partials.yaml'])