From 2ef6c4504f86ed5ce1806274e14e3a53e997c846 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Tue, 23 Aug 2022 15:12:22 -0500 Subject: [PATCH] chore: added extra variables owlbot kokoro configs (#1309) --- .kokoro/common.cfg | 20 ++++++++++++++++++++ .kokoro/common_env_vars.cfg | 19 +++++++++++++++++++ .kokoro/continuous/node12/common.cfg | 20 ++++++++++++++++++++ .kokoro/environment/common.cfg | 13 +++++++++++++ .kokoro/release/common.cfg | 13 +++++++++++++ owlbot.py | 22 ++++++++++++++++++++++ 6 files changed, 107 insertions(+) create mode 100644 .kokoro/common_env_vars.cfg diff --git a/.kokoro/common.cfg b/.kokoro/common.cfg index 0d3d29bc..35e1f26c 100644 --- a/.kokoro/common.cfg +++ b/.kokoro/common.cfg @@ -22,3 +22,23 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/nodejs-logging/.kokoro/test.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: "logging" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "nodejs" +} + +################################################### + diff --git a/.kokoro/common_env_vars.cfg b/.kokoro/common_env_vars.cfg new file mode 100644 index 00000000..803b0244 --- /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: "logging" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "nodejs" +} + +################################################### + diff --git a/.kokoro/continuous/node12/common.cfg b/.kokoro/continuous/node12/common.cfg index 0d3d29bc..35e1f26c 100644 --- a/.kokoro/continuous/node12/common.cfg +++ b/.kokoro/continuous/node12/common.cfg @@ -22,3 +22,23 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/nodejs-logging/.kokoro/test.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: "logging" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "nodejs" +} + +################################################### + diff --git a/.kokoro/environment/common.cfg b/.kokoro/environment/common.cfg index 24d85d51..6fbe6c30 100644 --- a/.kokoro/environment/common.cfg +++ b/.kokoro/environment/common.cfg @@ -26,3 +26,16 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/nodejs-logging/.kokoro/environment.sh" } + +env_vars: { + key: "PRODUCT_AREA_LABEL" + value: "observability" +} +env_vars: { + key: "PRODUCT_LABEL" + value: "logging" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "nodejs" +} diff --git a/.kokoro/release/common.cfg b/.kokoro/release/common.cfg index 3ba2eb09..02604bf1 100644 --- a/.kokoro/release/common.cfg +++ b/.kokoro/release/common.cfg @@ -6,3 +6,16 @@ before_action { } } } + +env_vars: { + key: "PRODUCT_AREA_LABEL" + value: "observability" +} +env_vars: { + key: "PRODUCT_LABEL" + value: "logging" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "nodejs" +} diff --git a/owlbot.py b/owlbot.py index 5d06615b..c7b30f53 100644 --- a/owlbot.py +++ b/owlbot.py @@ -14,6 +14,7 @@ """This script is used to synthesize generated parts of this library.""" +import os import synthtool as s import synthtool.languages.node as node @@ -42,3 +43,24 @@ "pass_down_envvars\+\=\(", 'pass_down_envvars+=(\n "ENVIRONMENT"\n "RUNTIME"' ) + +# -------------------------------------------------------------------------- +# 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}", +) + +for path, subdirs, files in os.walk(f".kokoro/continuous"): + 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}", + )