From 1d080537b4bed2474b547cbbb30f5149698d79e1 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Fri, 12 Aug 2022 15:58:02 -0700 Subject: [PATCH 1/2] chore: added extra variables owlbot kokoro configs --- .kokoro/common_env_vars.cfg | 19 +++++++++++++++++++ owlbot.py | 23 +++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 .kokoro/common_env_vars.cfg diff --git a/.kokoro/common_env_vars.cfg b/.kokoro/common_env_vars.cfg new file mode 100644 index 00000000..f523628d --- /dev/null +++ b/.kokoro/common_env_vars.cfg @@ -0,0 +1,19 @@ + +############################################# +# this section merged from .kokoro/common_env_vars.cfg using owlbot.py + +env_vars: { + key: "PRODUCT_AREA_LABEL" + value: "observability" +} +env_vars: { + key: "PRODUCT_LABEL" + value: "error-reporting" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "java" +} + +################################################### + diff --git a/owlbot.py b/owlbot.py index aef0e36c..85875cf8 100644 --- a/owlbot.py +++ b/owlbot.py @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import os import synthtool as s from synthtool.languages import java @@ -75,3 +76,25 @@ s.remove_staging_dirs() java.common_templates(excludes=['.github/auto-label.yaml']) + +# -------------------------------------------------------------------------- +# Modify test configs +# -------------------------------------------------------------------------- + +# add shared environment variables to test configs +s.move( + ".kokoro/common_env_vars.cfg", + ".kokoro/common.cfg", + merge=lambda src, dst, _, : f"{dst}\n{src}", +) +tracked_subdirs = ["continuous", "presubmit", "release", "nightly"] +for subdir in tracked_subdirs: + for path, subdirs, files in os.walk(f".kokoro/{subdir}"): + for name in files: + if name == "common.cfg": + file_path = os.path.join(path, name) + s.move( + ".kokoro/common_env_vars.cfg", + file_path, + merge=lambda src, dst, _, : f"{dst}\n{src}", + ) From 1a7661a88590712a3b40b3b5b287af0a451de576 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Fri, 12 Aug 2022 23:00:40 +0000 Subject: [PATCH 2/2] =?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/common.cfg | 20 ++++++++++++++++++++ .kokoro/continuous/common.cfg | 20 ++++++++++++++++++++ .kokoro/nightly/common.cfg | 20 ++++++++++++++++++++ .kokoro/presubmit/common.cfg | 20 ++++++++++++++++++++ .kokoro/release/common.cfg | 20 ++++++++++++++++++++ README.md | 2 +- 6 files changed, 101 insertions(+), 1 deletion(-) diff --git a/.kokoro/common.cfg b/.kokoro/common.cfg index e0398ca2..bb469abb 100644 --- a/.kokoro/common.cfg +++ b/.kokoro/common.cfg @@ -11,3 +11,23 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-errorreporting/.kokoro/build.sh" } + + +############################################# +# this section merged from .kokoro/common_env_vars.cfg using owlbot.py + +env_vars: { + key: "PRODUCT_AREA_LABEL" + value: "observability" +} +env_vars: { + key: "PRODUCT_LABEL" + value: "error-reporting" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "java" +} + +################################################### + diff --git a/.kokoro/continuous/common.cfg b/.kokoro/continuous/common.cfg index 00ab554d..dc381950 100644 --- a/.kokoro/continuous/common.cfg +++ b/.kokoro/continuous/common.cfg @@ -23,3 +23,23 @@ env_vars: { key: "JOB_TYPE" value: "test" } + + +############################################# +# this section merged from .kokoro/common_env_vars.cfg using owlbot.py + +env_vars: { + key: "PRODUCT_AREA_LABEL" + value: "observability" +} +env_vars: { + key: "PRODUCT_LABEL" + value: "error-reporting" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "java" +} + +################################################### + diff --git a/.kokoro/nightly/common.cfg b/.kokoro/nightly/common.cfg index 00ab554d..dc381950 100644 --- a/.kokoro/nightly/common.cfg +++ b/.kokoro/nightly/common.cfg @@ -23,3 +23,23 @@ env_vars: { key: "JOB_TYPE" value: "test" } + + +############################################# +# this section merged from .kokoro/common_env_vars.cfg using owlbot.py + +env_vars: { + key: "PRODUCT_AREA_LABEL" + value: "observability" +} +env_vars: { + key: "PRODUCT_LABEL" + value: "error-reporting" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "java" +} + +################################################### + diff --git a/.kokoro/presubmit/common.cfg b/.kokoro/presubmit/common.cfg index 276117b2..47544295 100644 --- a/.kokoro/presubmit/common.cfg +++ b/.kokoro/presubmit/common.cfg @@ -32,3 +32,23 @@ before_action { } } } + + +############################################# +# this section merged from .kokoro/common_env_vars.cfg using owlbot.py + +env_vars: { + key: "PRODUCT_AREA_LABEL" + value: "observability" +} +env_vars: { + key: "PRODUCT_LABEL" + value: "error-reporting" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "java" +} + +################################################### + diff --git a/.kokoro/release/common.cfg b/.kokoro/release/common.cfg index f5159234..a7242a91 100644 --- a/.kokoro/release/common.cfg +++ b/.kokoro/release/common.cfg @@ -47,3 +47,23 @@ before_action { } } } + + +############################################# +# this section merged from .kokoro/common_env_vars.cfg using owlbot.py + +env_vars: { + key: "PRODUCT_AREA_LABEL" + value: "observability" +} +env_vars: { + key: "PRODUCT_LABEL" + value: "error-reporting" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "java" +} + +################################################### + diff --git a/README.md b/README.md index b9756a8f..1ca95c19 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ If you are using Maven without 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.0.0') +implementation platform('com.google.cloud:libraries-bom:26.1.0') implementation 'com.google.cloud:google-cloud-errorreporting' ```