Skip to content

Commit 6ee83b5

Browse files
authored
refactor: normalises samples config names (#348)
Uses the same pattern as it is being done in the bigquery kokoro config files: java<version>-samples.cfg.
1 parent 3dcd9a7 commit 6ee83b5

12 files changed

+130
-46
lines changed

.kokoro/continuous/java11-samples.cfg

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java11"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "samples"
12+
}
13+
14+
env_vars: {
15+
key: "GCLOUD_PROJECT"
16+
value: "gcloud-devel"
17+
}
18+
19+
env_vars: {
20+
key: "GOOGLE_APPLICATION_CREDENTIALS"
21+
value: "keystore/73713_java_it_service_account"
22+
}
23+
24+
before_action {
25+
fetch_keystore {
26+
keystore_resource {
27+
keystore_config_id: 73713
28+
keyname: "java_it_service_account"
29+
}
30+
}
31+
}
32+

.kokoro/continuous/samples/common.cfg .kokoro/continuous/java8-samples.cfg

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Format: //devtools/kokoro/config/proto/build.proto
22

3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
7+
}
8+
39
env_vars: {
410
key: "JOB_TYPE"
511
value: "samples"
@@ -23,3 +29,4 @@ before_action {
2329
}
2430
}
2531
}
32+

.kokoro/continuous/samples/samples-java11.cfg

-7
This file was deleted.

.kokoro/continuous/samples/samples-java8.cfg

-7
This file was deleted.

.kokoro/nightly/java11-samples.cfg

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java11"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "samples"
12+
}
13+
14+
# TODO: remove this after we've migrated all tests and scripts
15+
env_vars: {
16+
key: "GCLOUD_PROJECT"
17+
value: "java-docs-samples-testing"
18+
}
19+
20+
env_vars: {
21+
key: "GOOGLE_CLOUD_PROJECT"
22+
value: "java-docs-samples-testing"
23+
}
24+
25+
env_vars: {
26+
key: "GOOGLE_APPLICATION_CREDENTIALS"
27+
value: "secret_manager/java-docs-samples-service-account"
28+
}
29+
30+
env_vars: {
31+
key: "SECRET_MANAGER_KEYS"
32+
value: "java-docs-samples-service-account"
33+
}
34+
35+
env_vars: {
36+
key: "ENABLE_BUILD_COP"
37+
value: "true"
38+
}
39+

.kokoro/nightly/java8-samples.cfg

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "samples"
12+
}
13+
14+
# TODO: remove this after we've migrated all tests and scripts
15+
env_vars: {
16+
key: "GCLOUD_PROJECT"
17+
value: "java-docs-samples-testing"
18+
}
19+
20+
env_vars: {
21+
key: "GOOGLE_CLOUD_PROJECT"
22+
value: "java-docs-samples-testing"
23+
}
24+
25+
env_vars: {
26+
key: "GOOGLE_APPLICATION_CREDENTIALS"
27+
value: "secret_manager/java-docs-samples-service-account"
28+
}
29+
30+
env_vars: {
31+
key: "SECRET_MANAGER_KEYS"
32+
value: "java-docs-samples-service-account"
33+
}
34+
35+
env_vars: {
36+
key: "ENABLE_BUILD_COP"
37+
value: "true"
38+
}
39+

.kokoro/nightly/samples/samples-java11.cfg

-7
This file was deleted.

.kokoro/nightly/samples/samples-java8.cfg

-7
This file was deleted.

.kokoro/presubmit/samples/common.cfg .kokoro/presubmit/java11-samples.cfg

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Format: //devtools/kokoro/config/proto/build.proto
22

3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java11"
7+
}
8+
39
env_vars: {
410
key: "JOB_TYPE"
511
value: "samples"
@@ -25,3 +31,4 @@ env_vars: {
2531
key: "SECRET_MANAGER_KEYS"
2632
value: "java-docs-samples-service-account"
2733
}
34+

.kokoro/nightly/samples/common.cfg .kokoro/presubmit/java8-samples.cfg

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Format: //devtools/kokoro/config/proto/build.proto
22

3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
7+
}
8+
39
env_vars: {
410
key: "JOB_TYPE"
511
value: "samples"
@@ -26,7 +32,3 @@ env_vars: {
2632
value: "java-docs-samples-service-account"
2733
}
2834

29-
env_vars: {
30-
key: "ENABLE_BUILD_COP"
31-
value: "true"
32-
}

.kokoro/presubmit/samples/samples-java11.cfg

-7
This file was deleted.

.kokoro/presubmit/samples/samples-java8.cfg

-7
This file was deleted.

0 commit comments

Comments
 (0)