From 8a79deff6ac22626a0102ebd1d7f89de5a8f2edb Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Fri, 22 Sep 2023 14:17:10 -0400 Subject: [PATCH 1/4] 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']) From d414c6e0bd53a2bd42eee444338d9d0184f301bf Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Fri, 22 Sep 2023 14:45:16 -0400 Subject: [PATCH 2/4] restore integration.cfg --- .kokoro/nightly/integration.cfg | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index a2907a257b..5228ee837e 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -6,6 +6,11 @@ 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" @@ -13,16 +18,16 @@ env_vars: { # TODO: remove this after we've migrated all tests and scripts env_vars: { key: "GCLOUD_PROJECT" - value: "java-docs-samples-testing" + value: "gcloud-devel" } env_vars: { key: "GOOGLE_CLOUD_PROJECT" - value: "java-docs-samples-testing" + value: "gcloud-devel" } env_vars: { - key: "ENABLE_FLAKYBOT" + key: "ENABLE_BUILD_COP" value: "true" } @@ -34,4 +39,4 @@ env_vars: { env_vars: { key: "SECRET_MANAGER_KEYS" value: "java-it-service-account" -} +} \ No newline at end of file From f6f4637cdd330bcddded00a63525f67e53ddc191 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Wed, 18 Oct 2023 13:45:39 -0400 Subject: [PATCH 3/4] chore: add partial file --- .github/.OwlBot.lock.yaml | 2 +- .integration-partials.yaml | 20 +++++++++++++++++++ .kokoro/nightly/integration.cfg.partials.yaml | 5 ----- owlbot.py | 4 ---- 4 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 .integration-partials.yaml delete mode 100644 .kokoro/nightly/integration.cfg.partials.yaml diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index fa335912bd..fb480872a1 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:3a95f1b9b1102865ca551b76be51d2bdb850900c4db2f6d79269e7af81ac8f84 + digest: sha256:d0a8eb7ffc63ddce4c63191373d6e99d5385516423c396de207dedf2b6db7427 # created: 2023-07-27T18:37:44.251188775Z diff --git a/.integration-partials.yaml b/.integration-partials.yaml new file mode 100644 index 0000000000..9a412fdd6c --- /dev/null +++ b/.integration-partials.yaml @@ -0,0 +1,20 @@ +integration_append: | + 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: "GCLOUD_PROJECT" + value: "gcloud-devel" + } + + env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" + } + + env_vars: { + key: "ENABLE_BUILD_COP" + value: "true" + } \ No newline at end of file diff --git a/.kokoro/nightly/integration.cfg.partials.yaml b/.kokoro/nightly/integration.cfg.partials.yaml deleted file mode 100644 index f9b7c7f192..0000000000 --- a/.kokoro/nightly/integration.cfg.partials.yaml +++ /dev/null @@ -1,5 +0,0 @@ -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 070229cabf..0a9493459e 100644 --- a/owlbot.py +++ b/owlbot.py @@ -96,10 +96,8 @@ def make_internal_only(sources): java.common_templates(excludes=[ '.gitignore', - '.kokoro/presubmit/integration.cfg', '.kokoro/presubmit/graalvm-native.cfg', '.kokoro/presubmit/graalvm-native-17.cfg', - # '.kokoro/nightly/integration.cfg', '.kokoro/presubmit/samples.cfg', '.kokoro/nightly/samples.cfg', # todo remove once template is updated @@ -111,5 +109,3 @@ def make_internal_only(sources): '.github/release-please.yml', 'renovate.json', ]) - -java.load_partials(['.kokoro/nightly/integration.cfg.partials.yaml']) From 643dd20d6d39f61480fc2c79b978b15dbb9c8304 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Wed, 18 Oct 2023 18:14:03 +0000 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .kokoro/nightly/integration.cfg | 31 +++++++++++++++++++------- .kokoro/nightly/java11-integration.cfg | 19 ++++++++++++++++ .kokoro/presubmit/integration.cfg | 25 ++++++++++++++++----- 3 files changed, 62 insertions(+), 13 deletions(-) diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index 5228ee837e..981f951edf 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" } @@ -39,4 +34,24 @@ env_vars: { env_vars: { key: "SECRET_MANAGER_KEYS" value: "java-it-service-account" +} + +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: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "ENABLE_BUILD_COP" + value: "true" } \ No newline at end of file diff --git a/.kokoro/nightly/java11-integration.cfg b/.kokoro/nightly/java11-integration.cfg index 6a6ef94eff..86feb8387d 100644 --- a/.kokoro/nightly/java11-integration.cfg +++ b/.kokoro/nightly/java11-integration.cfg @@ -36,3 +36,22 @@ env_vars: { value: "java-it-service-account" } +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: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "ENABLE_BUILD_COP" + value: "true" +} \ No newline at end of file diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg index b32d0e2b18..c7be128b4c 100644 --- a/.kokoro/presubmit/integration.cfg +++ b/.kokoro/presubmit/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" @@ -36,3 +31,23 @@ env_vars: { key: "SECRET_MANAGER_KEYS" value: "java-it-service-account" } + +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: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "ENABLE_BUILD_COP" + value: "true" +} \ No newline at end of file