From db99e08d4225ecb510d2f8313b6c3337d2031f15 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Wed, 16 Apr 2025 15:48:50 -0400
Subject: [PATCH 1/3] build: introduce testing infra for GraalVM "C"

---
 .kokoro/build.sh                              |  5 ---
 ...raalvm-native.cfg => graalvm-native-a.cfg} |  0
 ...lvm-native-17.cfg => graalvm-native-b.cfg} |  0
 .kokoro/presubmit/graalvm-native-c.cfg        | 33 +++++++++++++++++++
 4 files changed, 33 insertions(+), 5 deletions(-)
 rename .kokoro/presubmit/{graalvm-native.cfg => graalvm-native-a.cfg} (100%)
 rename .kokoro/presubmit/{graalvm-native-17.cfg => graalvm-native-b.cfg} (100%)
 create mode 100644 .kokoro/presubmit/graalvm-native-c.cfg

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 4239a1127..aec02e75e 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -75,11 +75,6 @@ graalvm)
     mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
     RETURN_CODE=$?
     ;;
-graalvm17)
-    # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
-    RETURN_CODE=$?
-    ;;
 samples)
     SAMPLES_DIR=samples
     # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
similarity index 100%
rename from .kokoro/presubmit/graalvm-native.cfg
rename to .kokoro/presubmit/graalvm-native-a.cfg
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
similarity index 100%
rename from .kokoro/presubmit/graalvm-native-17.cfg
rename to .kokoro/presubmit/graalvm-native-b.cfg
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
new file mode 100644
index 000000000..6b81304bb
--- /dev/null
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -0,0 +1,33 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.45.1"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "graalvm17"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
\ No newline at end of file

From 636a826ecab487a7962646288017107d41df2952 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Wed, 16 Apr 2025 16:35:26 -0400
Subject: [PATCH 2/3] fix: use JOB_TYPE=graalvm in job B

---
 .kokoro/presubmit/graalvm-native-b.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index 07ae08a98..bc3d8aad5 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -8,7 +8,7 @@ env_vars: {
 
 env_vars: {
   key: "JOB_TYPE"
-  value: "graalvm17"
+  value: "graalvm"
 }
 
 # TODO: remove this after we've migrated all tests and scripts

From 9f8bb0ca30afe6ce66f492f6d892a44962271aec Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Thu, 24 Apr 2025 12:39:23 -0400
Subject: [PATCH 3/3] chore: update versions to latest

---
 .kokoro/presubmit/graalvm-native-a.cfg | 2 +-
 .kokoro/presubmit/graalvm-native-b.cfg | 2 +-
 .kokoro/presubmit/graalvm-native-c.cfg | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index fb1979a33..54c4b8a3d 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-public-resources/graalvm_sdk_platform_a:3.45.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index bc3d8aad5..666fed537 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-public-resources/graalvm_sdk_platform_b:3.45.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index 6b81304bb..cdc17b472 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.45.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2"
 }
 
 env_vars: {