Skip to content

Commit d809481

Browse files
arpan14arpan14
authored
test: add kokoro configs to enable integration tests (prod, staging, devel) against directpath. (#2699)
We want to execute the integration test suite against the new directpath proxy within our pre-submits. * Created a new job-type with suffix `-directpath-enabled` * Added new configuration files for continous, nightly and presubmit. One file each for staging, cloud-devel and prod. * Each new configuration file is a clone of existing file and has an additional env variable defined. The new file uses a new job type with suffix `-directpath-enabled` ``` env_vars: { key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS" value: "true" } ```
1 parent e75a281 commit d809481

7 files changed

+202
-3
lines changed

‎.kokoro/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ javadoc)
7979
mvn javadoc:javadoc javadoc:test-javadoc
8080
RETURN_CODE=$?
8181
;;
82-
integration)
82+
integration|integration-directpath-enabled)
8383
mvn -B ${INTEGRATION_TEST_ARGS} \
8484
-ntp \
8585
-Penable-integration-tests \
@@ -94,7 +94,7 @@ integration)
9494
verify
9595
RETURN_CODE=$?
9696
;;
97-
integration-cloud-devel)
97+
integration-cloud-devel|integration-cloud-devel-directpath-enabled)
9898
mvn -B ${INTEGRATION_TEST_ARGS} \
9999
-ntp \
100100
-Penable-integration-tests \
@@ -110,7 +110,7 @@ integration-cloud-devel)
110110
verify
111111
RETURN_CODE=$?
112112
;;
113-
integration-cloud-staging)
113+
integration-cloud-staging|integration-cloud-staging-directpath-enabled)
114114
mvn -B ${INTEGRATION_TEST_ARGS} \
115115
-ntp \
116116
-Penable-integration-tests \

‎.kokoro/continuous/integration-cloud-devel-directpath-enabled.cfg

Lines changed: 32 additions & 0 deletions
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/java8"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "integration-cloud-devel-directpath-enabled"
12+
}
13+
14+
env_vars: {
15+
key: "GOOGLE_APPLICATION_CREDENTIALS"
16+
value: "secret_manager/java-client-testing"
17+
}
18+
19+
env_vars: {
20+
key: "SECRET_MANAGER_KEYS"
21+
value: "java-client-testing"
22+
}
23+
24+
env_vars: {
25+
key: "REPORT_COVERAGE"
26+
value: "true"
27+
}
28+
29+
env_vars: {
30+
key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
31+
value: "true"
32+
}

‎.kokoro/continuous/integration-cloud-staging-directpath-enabled.cfg

Lines changed: 32 additions & 0 deletions
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/java8"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "integration-cloud-staging-directpath-enabled"
12+
}
13+
14+
env_vars: {
15+
key: "GOOGLE_APPLICATION_CREDENTIALS"
16+
value: "secret_manager/java-client-testing"
17+
}
18+
19+
env_vars: {
20+
key: "SECRET_MANAGER_KEYS"
21+
value: "java-client-testing"
22+
}
23+
24+
env_vars: {
25+
key: "REPORT_COVERAGE"
26+
value: "true"
27+
}
28+
29+
env_vars: {
30+
key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
31+
value: "true"
32+
}

‎.kokoro/nightly/integration-cloud-devel-directpath-enabled.cfg

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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: "integration-cloud-devel-directpath-enabled"
12+
}
13+
14+
env_vars: {
15+
key: "GOOGLE_APPLICATION_CREDENTIALS"
16+
value: "secret_manager/java-client-testing"
17+
}
18+
19+
env_vars: {
20+
key: "SECRET_MANAGER_KEYS"
21+
value: "java-client-testing"
22+
}
23+
24+
env_vars: {
25+
key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
26+
value: "true"
27+
}
28+

‎.kokoro/nightly/integration-cloud-staging-directpath-enabled.cfg

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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: "integration-cloud-staging-directpath-enabled"
12+
}
13+
14+
env_vars: {
15+
key: "GOOGLE_APPLICATION_CREDENTIALS"
16+
value: "secret_manager/java-client-testing"
17+
}
18+
19+
env_vars: {
20+
key: "SECRET_MANAGER_KEYS"
21+
value: "java-client-testing"
22+
}
23+
24+
env_vars: {
25+
key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
26+
value: "true"
27+
}

‎.kokoro/nightly/integration-directpath-enabled.cfg

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
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: "integration-directpath-enabled"
12+
}
13+
# TODO: remove this after we've migrated all tests and scripts
14+
env_vars: {
15+
key: "GCLOUD_PROJECT"
16+
value: "java-docs-samples-testing"
17+
}
18+
19+
env_vars: {
20+
key: "GOOGLE_CLOUD_PROJECT"
21+
value: "java-docs-samples-testing"
22+
}
23+
24+
env_vars: {
25+
key: "ENABLE_FLAKYBOT"
26+
value: "true"
27+
}
28+
29+
env_vars: {
30+
key: "GOOGLE_APPLICATION_CREDENTIALS"
31+
value: "secret_manager/java-it-service-account"
32+
}
33+
34+
env_vars: {
35+
key: "SECRET_MANAGER_KEYS"
36+
value: "java-it-service-account"
37+
}
38+
39+
env_vars: {
40+
key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
41+
value: "true"
42+
}

‎.kokoro/presubmit/integration-directpath-enabled.cfg

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
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: "integration-directpath-enabled"
12+
}
13+
14+
# TODO: remove this after we've migrated all tests and scripts
15+
env_vars: {
16+
key: "GCLOUD_PROJECT"
17+
value: "gcloud-devel"
18+
}
19+
20+
env_vars: {
21+
key: "GOOGLE_CLOUD_PROJECT"
22+
value: "gcloud-devel"
23+
}
24+
25+
env_vars: {
26+
key: "GOOGLE_APPLICATION_CREDENTIALS"
27+
value: "secret_manager/java-it-service-account"
28+
}
29+
30+
env_vars: {
31+
key: "SECRET_MANAGER_KEYS"
32+
value: "java-it-service-account"
33+
}
34+
35+
env_vars: {
36+
key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
37+
value: "true"
38+
}

0 commit comments

Comments
 (0)