Skip to content

Commit 5dd4901

Browse files
fix(java): java 17 dependency arguments (#1266) (#77)
1 parent a91ca46 commit 5dd4901

File tree

4 files changed

+44
-8
lines changed

4 files changed

+44
-8
lines changed

.github/.OwlBot.lock.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
docker:
2-
image: gcr.io/repo-automation-bots/owlbot-java:latest
3-
digest: sha256:13b7387edb404234610d30473ac48210ae7fe42a136335ee2b2f8a07c4c7f6a5
2+
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
3+
digest: sha256:a3ac08d167454718ff057b97a1950d3cb5e16fc39fb3f355d90276285a6cac75

.kokoro/build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ integration)
6969
verify
7070
RETURN_CODE=$?
7171
;;
72+
graalvm)
73+
# Run Unit and Integration Tests with Native Image
74+
mvn test -Pnative -Penable-integration-tests
75+
RETURN_CODE=$?
76+
;;
7277
samples)
7378
SAMPLES_DIR=samples
7479
# only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.

.kokoro/dependencies.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,13 @@ function determineMavenOpts() {
3838
| sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
3939
)
4040

41-
case $javaVersion in
42-
"17")
41+
if [[ $javaVersion == 17* ]]
42+
then
4343
# MaxPermSize is no longer supported as of jdk 17
4444
echo -n "-Xmx1024m"
45-
;;
46-
*)
45+
else
4746
echo -n "-Xmx1024m -XX:MaxPermSize=128m"
48-
;;
49-
esac
47+
fi
5048
}
5149

5250
export MAVEN_OPTS=$(determineMavenOpts)
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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/graalvm"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "graalvm"
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+
}

0 commit comments

Comments
 (0)