diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 5b146924c..f8a1754b6 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -81,12 +81,12 @@ graalvm17)
;;
graalvmA)
# Run Unit and Integration Tests with Native Image
- mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-deps test -pl '!google-http-client-appengine'
+ mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative,native-tests,native-deps test -pl '!google-http-client-appengine'
RETURN_CODE=$?
;;
graalvmB)
# Run Unit and Integration Tests with Native Image
- mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-deps test -pl '!google-http-client-appengine'
+ mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative,native-tests,native-deps test -pl '!google-http-client-appengine'
RETURN_CODE=$?
;;
samples)
diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index 07344aef2..14faa3fda 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_a:1.7.1"
}
env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index 9ae343c8b..9ac140948 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_b:1.7.1"
}
env_vars: {
diff --git a/owlbot.py b/owlbot.py
index 841976c3b..6c8dbbb8a 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -29,6 +29,7 @@
"license-checks.xml",
".github/workflows/samples.yaml",
".kokoro/build.sh",
+ "renovate.json",
".github/workflows/ci.yaml"
]
)
diff --git a/pom.xml b/pom.xml
index 55df0e556..c7c2f5c53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,12 @@
+
+ com.google.cloud
+ native-image-shared-config
+ 1.7.1
+
+
- native
-
-
- org.junit.vintage
- junit-vintage-engine
- 5.10.0
- test
-
-
- org.graalvm.buildtools
- junit-platform-native
- 0.9.23
- test
-
-
+ native-tests
org.apache.maven.plugins
maven-surefire-plugin
-
- 2.22.2
+ ${surefire.version}
-
-
-
-
- org.graalvm.buildtools
- native-maven-plugin
- 0.9.23
- true
-
-
- test-native
-
- test
-
- test
-
-
-
-
- --no-fallback
- --no-server
-
+
+ **/*Test
+
-
Windows
diff --git a/renovate.json b/renovate.json
index 29a66a6b6..cd7d2400b 100644
--- a/renovate.json
+++ b/renovate.json
@@ -11,6 +11,17 @@
":autodetectPinVersions"
],
"ignorePaths": [".kokoro/requirements.txt"],
+ "customManagers": [
+ {
+ "customType": "regex",
+ "fileMatch": [
+ "^.kokoro/presubmit/graalvm-native.*.cfg$"
+ ],
+ "matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?.*?)\""],
+ "depNameTemplate": "com.google.cloud:native-image-shared-config",
+ "datasourceTemplate": "maven"
+ }
+ ],
"packageRules": [
{
"packagePatterns": [