Skip to content

Commit 32da417

Browse files
yifanzyifanzyifanzyifanz
authored
Merge branch 'main' into lar
2 parents b57466a + d18780e commit 32da417

File tree

151 files changed

+11149
-4832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+11149
-4832
lines changed

‎.github/.OwlBot.lock.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 Google LLC
1+
# Copyright 2023 Google LLC
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -13,4 +13,4 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
16-
digest: sha256:9de537d592b60e5eac73b374a28263969bae91ecdb29b445e894576fbf54851c
16+
digest: sha256:4566cf7fcd0eece77705330267b2b61a70165711c7829d049b60bc2f1bbcd74e

‎.kokoro/build.sh

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ integration)
8686
verify
8787
RETURN_CODE=$?
8888
;;
89-
integration-staging)
89+
integration-cloud-devel)
9090
mvn -B ${INTEGRATION_TEST_ARGS} \
9191
-ntp \
9292
-Penable-integration-tests \
@@ -96,7 +96,23 @@ integration-staging)
9696
-Denforcer.skip=true \
9797
-Dmaven.main.skip=true \
9898
-Dspanner.gce.config.server_url=https://staging-wrenchworks.sandbox.googleapis.com \
99-
-Dspanner.testenv.instance=projects/span-cloud-testing/instances/gaurav-test-instance \
99+
-Dspanner.testenv.instance=projects/span-cloud-testing/instances/spanner-testing-east1 \
100+
-Dspanner.gce.config.project_id=span-cloud-testing \
101+
-fae \
102+
verify
103+
RETURN_CODE=$?
104+
;;
105+
integration-cloud-staging)
106+
mvn -B ${INTEGRATION_TEST_ARGS} \
107+
-ntp \
108+
-Penable-integration-tests \
109+
-Djava.net.preferIPv4Stack=true \
110+
-DtrimStackTrace=false \
111+
-Dclirr.skip=true \
112+
-Denforcer.skip=true \
113+
-Dmaven.main.skip=true \
114+
-Dspanner.gce.config.server_url=https://preprod-spanner.sandbox.googleapis.com \
115+
-Dspanner.testenv.instance=projects/span-cloud-testing/instances/spanner-testing \
100116
-Dspanner.gce.config.project_id=span-cloud-testing \
101117
-fae \
102118
verify

‎.kokoro/nightly/integration-staging.cfg renamed to ‎.kokoro/continuous/integration-cloud-devel.cfg

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,20 @@ env_vars: {
88

99
env_vars: {
1010
key: "JOB_TYPE"
11-
value: "integration-staging"
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"
11+
value: "integration-cloud-devel"
2212
}
2313

2414
env_vars: {
2515
key: "GOOGLE_APPLICATION_CREDENTIALS"
26-
value: "secret_manager/java-it-service-account"
16+
value: "secret_manager/java-client-testing"
2717
}
2818

2919
env_vars: {
3020
key: "SECRET_MANAGER_KEYS"
31-
value: "java-it-service-account"
21+
value: "java-client-testing"
3222
}
23+
24+
env_vars: {
25+
key: "REPORT_COVERAGE"
26+
value: "true"
27+
}

‎.kokoro/continuous/integration-cloud-staging.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"
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+
}

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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"
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+
}

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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"
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+
}

‎.kokoro/requirements.in

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,6 @@
1-
gcp-docuploader==0.6.3
2-
google-crc32c==1.3.0
3-
googleapis-common-protos==1.56.3
4-
gcp-releasetool==1.9.1
5-
cryptography==38.0.3
6-
cachetools==4.2.4
7-
cffi==1.15.1
8-
jeepney==0.7.1
9-
jinja2==3.0.3
10-
markupsafe==2.0.1
11-
keyring==23.4.1
12-
packaging==21.3
13-
protobuf==3.19.5
14-
pyjwt==2.4.0
15-
pyparsing==3.0.9
16-
pycparser==2.21
17-
pyperclip==1.8.2
18-
python-dateutil==2.8.2
19-
requests==2.27.1
20-
certifi==2022.12.7
21-
importlib-metadata==4.8.3
22-
zipp==3.6.0
23-
google_api_core==2.8.2
24-
google-cloud-storage==2.0.0
25-
google-resumable-media==2.3.3
26-
google-cloud-core==2.3.1
27-
typing-extensions==4.1.1
28-
urllib3==1.26.12
29-
zipp==3.6.0
30-
rsa==4.9
31-
six==1.16.0
32-
attrs==22.1.0
33-
google-auth==2.14.1
34-
idna==3.4
1+
gcp-docuploader
2+
gcp-releasetool
3+
wheel
4+
setuptools
5+
typing-extensions
6+
click<8.1.0

0 commit comments

Comments
 (0)