Skip to content

Commit ab496ad

Browse files
chore: added extra variables owlbot kokoro configs (#1033)
1 parent 6ec48b8 commit ab496ad

File tree

13 files changed

+232
-0
lines changed

13 files changed

+232
-0
lines changed

‎.kokoro/common.cfg

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,23 @@ env_vars: {
1111
key: "TRAMPOLINE_BUILD_FILE"
1212
value: "github/java-logging/.kokoro/build.sh"
1313
}
14+
15+
16+
#############################################
17+
# this section merged from .kokoro/common_env_vars.cfg using owlbot.py
18+
19+
env_vars: {
20+
key: "PRODUCT_AREA_LABEL"
21+
value: "observability"
22+
}
23+
env_vars: {
24+
key: "PRODUCT_LABEL"
25+
value: "logging"
26+
}
27+
env_vars: {
28+
key: "LANGUAGE_LABEL"
29+
value: "java"
30+
}
31+
32+
###################################################
33+

‎.kokoro/common_env_vars.cfg

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
2+
#############################################
3+
# this section merged from .kokoro/common_env_vars.cfg using owlbot.py
4+
5+
env_vars: {
6+
key: "PRODUCT_AREA_LABEL"
7+
value: "observability"
8+
}
9+
env_vars: {
10+
key: "PRODUCT_LABEL"
11+
value: "logging"
12+
}
13+
env_vars: {
14+
key: "LANGUAGE_LABEL"
15+
value: "java"
16+
}
17+
18+
###################################################
19+

‎.kokoro/continuous/common.cfg

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,23 @@ env_vars: {
2323
key: "JOB_TYPE"
2424
value: "test"
2525
}
26+
27+
28+
#############################################
29+
# this section merged from .kokoro/common_env_vars.cfg using owlbot.py
30+
31+
env_vars: {
32+
key: "PRODUCT_AREA_LABEL"
33+
value: "observability"
34+
}
35+
env_vars: {
36+
key: "PRODUCT_LABEL"
37+
value: "logging"
38+
}
39+
env_vars: {
40+
key: "LANGUAGE_LABEL"
41+
value: "java"
42+
}
43+
44+
###################################################
45+

‎.kokoro/environment/appengine_flex/common.cfg

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,18 @@ env_vars: {
4040
key: "GOOGLE_CLOUD_PROJECT"
4141
value: "gcloud-devel"
4242
}
43+
44+
# add labels to help with testgrid filtering
45+
env_vars: {
46+
key: "PRODUCT_AREA_LABEL"
47+
value: "observability"
48+
}
49+
env_vars: {
50+
key: "PRODUCT_LABEL"
51+
value: "logging"
52+
}
53+
env_vars: {
54+
key: "LANGUAGE_LABEL"
55+
value: "java"
56+
}
57+

‎.kokoro/environment/appengine_standard/common.cfg

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,18 @@ env_vars: {
4040
key: "GOOGLE_CLOUD_PROJECT"
4141
value: "gcloud-devel"
4242
}
43+
44+
# add labels to help with testgrid filtering
45+
env_vars: {
46+
key: "PRODUCT_AREA_LABEL"
47+
value: "observability"
48+
}
49+
env_vars: {
50+
key: "PRODUCT_LABEL"
51+
value: "logging"
52+
}
53+
env_vars: {
54+
key: "LANGUAGE_LABEL"
55+
value: "java"
56+
}
57+

‎.kokoro/environment/cloudrun/common.cfg

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,18 @@ env_vars: {
4040
key: "GOOGLE_CLOUD_PROJECT"
4141
value: "gcloud-devel"
4242
}
43+
44+
# add labels to help with testgrid filtering
45+
env_vars: {
46+
key: "PRODUCT_AREA_LABEL"
47+
value: "observability"
48+
}
49+
env_vars: {
50+
key: "PRODUCT_LABEL"
51+
value: "logging"
52+
}
53+
env_vars: {
54+
key: "LANGUAGE_LABEL"
55+
value: "java"
56+
}
57+

‎.kokoro/environment/compute/common.cfg

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,18 @@ env_vars: {
4040
key: "GOOGLE_CLOUD_PROJECT"
4141
value: "gcloud-devel"
4242
}
43+
44+
# add labels to help with testgrid filtering
45+
env_vars: {
46+
key: "PRODUCT_AREA_LABEL"
47+
value: "observability"
48+
}
49+
env_vars: {
50+
key: "PRODUCT_LABEL"
51+
value: "logging"
52+
}
53+
env_vars: {
54+
key: "LANGUAGE_LABEL"
55+
value: "java"
56+
}
57+

‎.kokoro/environment/functions/common.cfg

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,18 @@ env_vars: {
4040
key: "GOOGLE_CLOUD_PROJECT"
4141
value: "gcloud-devel"
4242
}
43+
44+
# add labels to help with testgrid filtering
45+
env_vars: {
46+
key: "PRODUCT_AREA_LABEL"
47+
value: "observability"
48+
}
49+
env_vars: {
50+
key: "PRODUCT_LABEL"
51+
value: "logging"
52+
}
53+
env_vars: {
54+
key: "LANGUAGE_LABEL"
55+
value: "java"
56+
}
57+

‎.kokoro/environment/kubernetes/common.cfg

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,18 @@ env_vars: {
4040
key: "GOOGLE_CLOUD_PROJECT"
4141
value: "gcloud-devel"
4242
}
43+
44+
# add labels to help with testgrid filtering
45+
env_vars: {
46+
key: "PRODUCT_AREA_LABEL"
47+
value: "observability"
48+
}
49+
env_vars: {
50+
key: "PRODUCT_LABEL"
51+
value: "logging"
52+
}
53+
env_vars: {
54+
key: "LANGUAGE_LABEL"
55+
value: "java"
56+
}
57+

‎.kokoro/nightly/common.cfg

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,23 @@ env_vars: {
2323
key: "JOB_TYPE"
2424
value: "test"
2525
}
26+
27+
28+
#############################################
29+
# this section merged from .kokoro/common_env_vars.cfg using owlbot.py
30+
31+
env_vars: {
32+
key: "PRODUCT_AREA_LABEL"
33+
value: "observability"
34+
}
35+
env_vars: {
36+
key: "PRODUCT_LABEL"
37+
value: "logging"
38+
}
39+
env_vars: {
40+
key: "LANGUAGE_LABEL"
41+
value: "java"
42+
}
43+
44+
###################################################
45+

‎.kokoro/presubmit/common.cfg

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,23 @@ before_action {
3232
}
3333
}
3434
}
35+
36+
37+
#############################################
38+
# this section merged from .kokoro/common_env_vars.cfg using owlbot.py
39+
40+
env_vars: {
41+
key: "PRODUCT_AREA_LABEL"
42+
value: "observability"
43+
}
44+
env_vars: {
45+
key: "PRODUCT_LABEL"
46+
value: "logging"
47+
}
48+
env_vars: {
49+
key: "LANGUAGE_LABEL"
50+
value: "java"
51+
}
52+
53+
###################################################
54+

‎.kokoro/release/common.cfg

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,23 @@ before_action {
4747
}
4848
}
4949
}
50+
51+
52+
#############################################
53+
# this section merged from .kokoro/common_env_vars.cfg using owlbot.py
54+
55+
env_vars: {
56+
key: "PRODUCT_AREA_LABEL"
57+
value: "observability"
58+
}
59+
env_vars: {
60+
key: "PRODUCT_LABEL"
61+
value: "logging"
62+
}
63+
env_vars: {
64+
key: "LANGUAGE_LABEL"
65+
value: "java"
66+
}
67+
68+
###################################################
69+

��owlbot.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
import os
1516
import synthtool as s
1617
from synthtool.languages import java
1718

@@ -94,3 +95,25 @@
9495
"CONTRIBUTING.md",
9596
]
9697
)
98+
99+
# --------------------------------------------------------------------------
100+
# Modify test configs
101+
# --------------------------------------------------------------------------
102+
103+
# add shared environment variables to test configs
104+
s.move(
105+
".kokoro/common_env_vars.cfg",
106+
".kokoro/common.cfg",
107+
merge=lambda src, dst, _, : f"{dst}\n{src}",
108+
)
109+
tracked_subdirs = ["continuous", "presubmit", "release", "nightly"]
110+
for subdir in tracked_subdirs:
111+
for path, subdirs, files in os.walk(f".kokoro/{subdir}"):
112+
for name in files:
113+
if name == "common.cfg":
114+
file_path = os.path.join(path, name)
115+
s.move(
116+
".kokoro/common_env_vars.cfg",
117+
file_path,
118+
merge=lambda src, dst, _, : f"{dst}\n{src}",
119+
)

0 commit comments

Comments
 (0)