chore: added extra variables owlbot kokoro configs (#1033)

daniel-sanche · web-flow · commit ab496ad6c34f · 2022-08-23T12:47:24.000-07:00
diff --git a/.kokoro/common.cfg b/.kokoro/common.cfg
@@ -11,3 +11,23 @@ env_vars: {
   key: "TRAMPOLINE_BUILD_FILE"
   value: "github/java-logging/.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: "logging"
+}
+env_vars: {
+    key: "LANGUAGE_LABEL"
+    value: "java"
+}
+
+###################################################
+
diff --git a/.kokoro/common_env_vars.cfg 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: "java"
+}
+
+###################################################
+
diff --git 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: "logging"
+}
+env_vars: {
+    key: "LANGUAGE_LABEL"
+    value: "java"
+}
+
+###################################################
+
diff --git a/.kokoro/environment/appengine_flex/common.cfg b/.kokoro/environment/appengine_flex/common.cfg
@@ -40,3 +40,18 @@ env_vars: {
   key: "GOOGLE_CLOUD_PROJECT"
   value: "gcloud-devel"
 }
+
+# add labels to help with testgrid filtering
+env_vars: {
+    key: "PRODUCT_AREA_LABEL"
+    value: "observability"
+}
+env_vars: {
+    key: "PRODUCT_LABEL"
+    value: "logging"
+}
+env_vars: {
+    key: "LANGUAGE_LABEL"
+    value: "java"
+}
+
diff --git a/.kokoro/environment/appengine_standard/common.cfg b/.kokoro/environment/appengine_standard/common.cfg
@@ -40,3 +40,18 @@ env_vars: {
   key: "GOOGLE_CLOUD_PROJECT"
   value: "gcloud-devel"
 }
+
+# add labels to help with testgrid filtering
+env_vars: {
+    key: "PRODUCT_AREA_LABEL"
+    value: "observability"
+}
+env_vars: {
+    key: "PRODUCT_LABEL"
+    value: "logging"
+}
+env_vars: {
+    key: "LANGUAGE_LABEL"
+    value: "java"
+}
+
diff --git a/.kokoro/environment/cloudrun/common.cfg b/.kokoro/environment/cloudrun/common.cfg
@@ -40,3 +40,18 @@ env_vars: {
   key: "GOOGLE_CLOUD_PROJECT"
   value: "gcloud-devel"
 }
+
+# add labels to help with testgrid filtering
+env_vars: {
+    key: "PRODUCT_AREA_LABEL"
+    value: "observability"
+}
+env_vars: {
+    key: "PRODUCT_LABEL"
+    value: "logging"
+}
+env_vars: {
+    key: "LANGUAGE_LABEL"
+    value: "java"
+}
+
diff --git a/.kokoro/environment/compute/common.cfg b/.kokoro/environment/compute/common.cfg
@@ -40,3 +40,18 @@ env_vars: {
   key: "GOOGLE_CLOUD_PROJECT"
   value: "gcloud-devel"
 }
+
+# add labels to help with testgrid filtering
+env_vars: {
+    key: "PRODUCT_AREA_LABEL"
+    value: "observability"
+}
+env_vars: {
+    key: "PRODUCT_LABEL"
+    value: "logging"
+}
+env_vars: {
+    key: "LANGUAGE_LABEL"
+    value: "java"
+}
+
diff --git a/.kokoro/environment/functions/common.cfg b/.kokoro/environment/functions/common.cfg
@@ -40,3 +40,18 @@ env_vars: {
   key: "GOOGLE_CLOUD_PROJECT"
   value: "gcloud-devel"
 }
+
+# add labels to help with testgrid filtering
+env_vars: {
+    key: "PRODUCT_AREA_LABEL"
+    value: "observability"
+}
+env_vars: {
+    key: "PRODUCT_LABEL"
+    value: "logging"
+}
+env_vars: {
+    key: "LANGUAGE_LABEL"
+    value: "java"
+}
+
diff --git a/.kokoro/environment/kubernetes/common.cfg b/.kokoro/environment/kubernetes/common.cfg
@@ -40,3 +40,18 @@ env_vars: {
   key: "GOOGLE_CLOUD_PROJECT"
   value: "gcloud-devel"
 }
+
+# add labels to help with testgrid filtering
+env_vars: {
+    key: "PRODUCT_AREA_LABEL"
+    value: "observability"
+}
+env_vars: {
+    key: "PRODUCT_LABEL"
+    value: "logging"
+}
+env_vars: {
+    key: "LANGUAGE_LABEL"
+    value: "java"
+}
+
diff --git 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: "logging"
+}
+env_vars: {
+    key: "LANGUAGE_LABEL"
+    value: "java"
+}
+
+###################################################
+
diff --git 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: "logging"
+}
+env_vars: {
+    key: "LANGUAGE_LABEL"
+    value: "java"
+}
+
+###################################################
+
diff --git 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: "logging"
+}
+env_vars: {
+    key: "LANGUAGE_LABEL"
+    value: "java"
+}
+
+###################################################
+
diff --git 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
 
@@ -94,3 +95,25 @@
         "CONTRIBUTING.md",
     ]
 )
+
+# --------------------------------------------------------------------------
+# 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}",
+                )
