From 7009c6d203d2b5cda117b6a62a2c3cca05d2b6ec Mon Sep 17 00:00:00 2001 From: Evan Greco Date: Tue, 14 Nov 2023 20:37:59 +0000 Subject: [PATCH 1/6] feat: add new configuration for nightly retry-related tests. --- .kokoro/build.sh | 22 ++++++++++++++++++++++ .kokoro/nightly/retry_non_quota.cfg | 11 +++++++++++ .kokoro/nightly/retry_quota.cfg | 11 +++++++++++ 3 files changed, 44 insertions(+) create mode 100644 .kokoro/nightly/retry_non_quota.cfg create mode 100644 .kokoro/nightly/retry_quota.cfg diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 53e7c2e74b..c7de14bb55 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -112,6 +112,28 @@ clirr) mvn -B -Denforcer.skip=true clirr:check RETURN_CODE=$? ;; +retry_quota) + mvn -B ${INTEGRATION_TEST_ARGS} \ + -Penable-integration-tests \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dit.test=ITBigQueryWriteQuotaRetryTest \ + -fae \ + verify + RETURN_CODE=$? + ;; +retry_non_quota) + mvn -B ${INTEGRATION_TEST_ARGS} \ + -Penable-integration-tests \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dit.test=ITBigQueryWriteNonQuotaRetryTest \ + -fae \ + verify + RETURN_CODE=$? + ;; *) ;; esac diff --git a/.kokoro/nightly/retry_non_quota.cfg b/.kokoro/nightly/retry_non_quota.cfg new file mode 100644 index 0000000000..7f4cfa6fcc --- /dev/null +++ b/.kokoro/nightly/retry_non_quota.cfg @@ -0,0 +1,11 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "bq-write-api-java-retry-test" +} + +env_vars: { + key: "JOB_TYPE" + value: "retry_non_quota" +} \ No newline at end of file diff --git a/.kokoro/nightly/retry_quota.cfg b/.kokoro/nightly/retry_quota.cfg new file mode 100644 index 0000000000..420f6d5046 --- /dev/null +++ b/.kokoro/nightly/retry_quota.cfg @@ -0,0 +1,11 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "bq-writeapi-java-quota-retry" +} + +env_vars: { + key: "JOB_TYPE" + value: "retry_quota" +} \ No newline at end of file From c01b3d93d650cd6983d35c5be6d50e338e283488 Mon Sep 17 00:00:00 2001 From: Evan Greco Date: Tue, 14 Nov 2023 20:39:32 +0000 Subject: [PATCH 2/6] Add newlines to EOF --- .kokoro/nightly/retry_non_quota.cfg | 2 +- .kokoro/nightly/retry_quota.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.kokoro/nightly/retry_non_quota.cfg b/.kokoro/nightly/retry_non_quota.cfg index 7f4cfa6fcc..6eb85ba0e3 100644 --- a/.kokoro/nightly/retry_non_quota.cfg +++ b/.kokoro/nightly/retry_non_quota.cfg @@ -8,4 +8,4 @@ env_vars: { env_vars: { key: "JOB_TYPE" value: "retry_non_quota" -} \ No newline at end of file +} diff --git a/.kokoro/nightly/retry_quota.cfg b/.kokoro/nightly/retry_quota.cfg index 420f6d5046..afecf23ae1 100644 --- a/.kokoro/nightly/retry_quota.cfg +++ b/.kokoro/nightly/retry_quota.cfg @@ -8,4 +8,4 @@ env_vars: { env_vars: { key: "JOB_TYPE" value: "retry_quota" -} \ No newline at end of file +} From 2bda766bdb057123afc7497b614c4352a9b875d8 Mon Sep 17 00:00:00 2001 From: Evan Greco Date: Tue, 14 Nov 2023 21:51:21 +0000 Subject: [PATCH 3/6] Add more kokoro config, fix test commands --- .kokoro/build.sh | 18 ++++-------------- .kokoro/nightly/retry_non_quota.cfg | 26 ++++++++++++++++++++++++++ .kokoro/nightly/retry_quota.cfg | 26 ++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 14 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index c7de14bb55..d12485e44b 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -114,24 +114,14 @@ clirr) ;; retry_quota) mvn -B ${INTEGRATION_TEST_ARGS} \ - -Penable-integration-tests \ - -DtrimStackTrace=false \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -Dit.test=ITBigQueryWriteQuotaRetryTest \ - -fae \ - verify + -DTest=ITBigQueryWriteQuotaRetryTest \ + test RETURN_CODE=$? ;; retry_non_quota) mvn -B ${INTEGRATION_TEST_ARGS} \ - -Penable-integration-tests \ - -DtrimStackTrace=false \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -Dit.test=ITBigQueryWriteNonQuotaRetryTest \ - -fae \ - verify + -DTest=ITBigQueryWriteNonQuotaRetryTest \ + test RETURN_CODE=$? ;; *) diff --git a/.kokoro/nightly/retry_non_quota.cfg b/.kokoro/nightly/retry_non_quota.cfg index 6eb85ba0e3..f481a726bb 100644 --- a/.kokoro/nightly/retry_non_quota.cfg +++ b/.kokoro/nightly/retry_non_quota.cfg @@ -1,5 +1,16 @@ # Format: //devtools/kokoro/config/proto/build.proto +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "bq-write-api-java-retry-test" +} + env_vars: { key: "GOOGLE_CLOUD_PROJECT" value: "bq-write-api-java-retry-test" @@ -9,3 +20,18 @@ env_vars: { key: "JOB_TYPE" value: "retry_non_quota" } + +env_vars: { + key: "ENABLE_FLAKYBOT" + value: "true" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} diff --git a/.kokoro/nightly/retry_quota.cfg b/.kokoro/nightly/retry_quota.cfg index afecf23ae1..9da681d9b5 100644 --- a/.kokoro/nightly/retry_quota.cfg +++ b/.kokoro/nightly/retry_quota.cfg @@ -1,5 +1,16 @@ # Format: //devtools/kokoro/config/proto/build.proto +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "bq-writeapi-java-quota-retry" +} + env_vars: { key: "GOOGLE_CLOUD_PROJECT" value: "bq-writeapi-java-quota-retry" @@ -9,3 +20,18 @@ env_vars: { key: "JOB_TYPE" value: "retry_quota" } + +env_vars: { + key: "ENABLE_FLAKYBOT" + value: "true" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} From 7f3e973c9662f9e95dfd043055cf19df838a61e3 Mon Sep 17 00:00:00 2001 From: Evan Greco Date: Tue, 14 Nov 2023 21:54:11 +0000 Subject: [PATCH 4/6] fix typo --- .kokoro/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index d12485e44b..6bbfd9645b 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -114,13 +114,13 @@ clirr) ;; retry_quota) mvn -B ${INTEGRATION_TEST_ARGS} \ - -DTest=ITBigQueryWriteQuotaRetryTest \ + -Dtest=ITBigQueryWriteQuotaRetryTest \ test RETURN_CODE=$? ;; retry_non_quota) mvn -B ${INTEGRATION_TEST_ARGS} \ - -DTest=ITBigQueryWriteNonQuotaRetryTest \ + -Dtest=ITBigQueryWriteNonQuotaRetryTest \ test RETURN_CODE=$? ;; From 5908ce5aeebfc2845dad11b36e3e651c684246dc Mon Sep 17 00:00:00 2001 From: Evan Greco Date: Tue, 14 Nov 2023 22:17:47 +0000 Subject: [PATCH 5/6] Add new retry cfgs to owlbot exclude list --- owlbot.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/owlbot.py b/owlbot.py index 16352d12b8..7f873745ef 100644 --- a/owlbot.py +++ b/owlbot.py @@ -25,6 +25,8 @@ excludes=[ "renovate.json", ".kokoro/build.sh", + ".kokoro/nightly/retry_non_quota.cfg", + ".kokoro/nightly/retry_quota.cfg", ".kokoro/nightly/samples.cfg", ".kokoro/presubmit/samples.cfg", ".kokoro/dependencies.sh", From 036b292fdef44537dbdb2f6e24d8dbd827ad5e9c Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 14 Nov 2023 22:19:22 +0000 Subject: [PATCH 6/6] =?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 --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 82c9e4277d..5ac5115b67 100644 --- a/README.md +++ b/README.md @@ -50,20 +50,20 @@ If you are using Maven without the BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.26.0') +implementation platform('com.google.cloud:libraries-bom:26.27.0') implementation 'com.google.cloud:google-cloud-bigquerystorage' ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-bigquerystorage:2.44.1' +implementation 'com.google.cloud:google-cloud-bigquerystorage:2.45.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.44.1" +libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.45.0" ``` @@ -220,7 +220,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigquerystorage/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-bigquerystorage.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigquerystorage/2.44.1 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigquerystorage/2.45.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles