From eebe35141daf6a0aeadca7e55ff9ca9e344cea07 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Tue, 15 Apr 2025 13:05:51 -0400
Subject: [PATCH 1/4] 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} |  2 +-
 .../graalvm-native-c.cfg}                     |  7 +++-
 .kokoro/nightly/graalvm-native-17.cfg         | 38 -------------------
 .kokoro/nightly/graalvm-native.cfg            | 38 -------------------
 .kokoro/presubmit/graalvm-native-17.cfg       | 33 ----------------
 7 files changed, 7 insertions(+), 116 deletions(-)
 rename .kokoro/continuous/{graalvm-native.cfg => graalvm-native-a.cfg} (100%)
 rename .kokoro/continuous/{graalvm-native-17.cfg => graalvm-native-b.cfg} (97%)
 rename .kokoro/{presubmit/graalvm-native.cfg => continuous/graalvm-native-c.cfg} (90%)
 delete mode 100644 .kokoro/nightly/graalvm-native-17.cfg
 delete mode 100644 .kokoro/nightly/graalvm-native.cfg
 delete mode 100644 .kokoro/presubmit/graalvm-native-17.cfg

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 64f559885..7e555dce4 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/continuous/graalvm-native.cfg b/.kokoro/continuous/graalvm-native-a.cfg
similarity index 100%
rename from .kokoro/continuous/graalvm-native.cfg
rename to .kokoro/continuous/graalvm-native-a.cfg
diff --git a/.kokoro/continuous/graalvm-native-17.cfg b/.kokoro/continuous/graalvm-native-b.cfg
similarity index 97%
rename from .kokoro/continuous/graalvm-native-17.cfg
rename to .kokoro/continuous/graalvm-native-b.cfg
index 7e3c1177d..edf77587e 100644
--- a/.kokoro/continuous/graalvm-native-17.cfg
+++ b/.kokoro/continuous/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
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/continuous/graalvm-native-c.cfg
similarity index 90%
rename from .kokoro/presubmit/graalvm-native.cfg
rename to .kokoro/continuous/graalvm-native-c.cfg
index fb1979a33..801d5d79c 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/continuous/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_a:3.45.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.45.1"
 }
 
 env_vars: {
@@ -31,3 +31,8 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "java-it-service-account"
 }
+
+env_vars: {
+  key: "ENABLE_FLAKYBOT"
+  value: "true"
+}
\ No newline at end of file
diff --git a/.kokoro/nightly/graalvm-native-17.cfg b/.kokoro/nightly/graalvm-native-17.cfg
deleted file mode 100644
index 15ed86292..000000000
--- a/.kokoro/nightly/graalvm-native-17.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "nightly-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: "ENABLE_FLAKYBOT"
-  value: "true"
-}
-
-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
diff --git a/.kokoro/nightly/graalvm-native.cfg b/.kokoro/nightly/graalvm-native.cfg
deleted file mode 100644
index 57c1e3511..000000000
--- a/.kokoro/nightly/graalvm-native.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "nightly-graalvm"
-}
-
-# 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: "ENABLE_FLAKYBOT"
-  value: "true"
-}
-
-env_vars: {
-  key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-it-service-account"
-}
-
-env_vars: {
-  key: "SECRET_MANAGER_KEYS"
-  value: "java-it-service-account"
-}
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
deleted file mode 100644
index 2ea1a05e0..000000000
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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_b: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 30b7062bd4c572a3ff5d71acd25a3349b420deb5 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Tue, 15 Apr 2025 13:21:19 -0400
Subject: [PATCH 2/4] chore: use nightly jobs

---
 .kokoro/nightly/graalvm-native-a.cfg | 38 ++++++++++++++++++++++++++++
 .kokoro/nightly/graalvm-native-b.cfg | 38 ++++++++++++++++++++++++++++
 .kokoro/nightly/graalvm-native-c.cfg | 38 ++++++++++++++++++++++++++++
 3 files changed, 114 insertions(+)
 create mode 100644 .kokoro/nightly/graalvm-native-a.cfg
 create mode 100644 .kokoro/nightly/graalvm-native-b.cfg
 create mode 100644 .kokoro/nightly/graalvm-native-c.cfg

diff --git a/.kokoro/nightly/graalvm-native-a.cfg b/.kokoro/nightly/graalvm-native-a.cfg
new file mode 100644
index 000000000..a187fe3e9
--- /dev/null
+++ b/.kokoro/nightly/graalvm-native-a.cfg
@@ -0,0 +1,38 @@
+# 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_a"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "nightly-graalvm"
+}
+
+# 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: "ENABLE_FLAKYBOT"
+  value: "true"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
diff --git a/.kokoro/nightly/graalvm-native-b.cfg b/.kokoro/nightly/graalvm-native-b.cfg
new file mode 100644
index 000000000..c9053648e
--- /dev/null
+++ b/.kokoro/nightly/graalvm-native-b.cfg
@@ -0,0 +1,38 @@
+# 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_b"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "nightly-graalvm"
+}
+
+# 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: "ENABLE_FLAKYBOT"
+  value: "true"
+}
+
+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
diff --git a/.kokoro/nightly/graalvm-native-c.cfg b/.kokoro/nightly/graalvm-native-c.cfg
new file mode 100644
index 000000000..96a672d0f
--- /dev/null
+++ b/.kokoro/nightly/graalvm-native-c.cfg
@@ -0,0 +1,38 @@
+# 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"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "nightly-graalvm"
+}
+
+# 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: "ENABLE_FLAKYBOT"
+  value: "true"
+}
+
+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 158c3307704f02f91ec8d93735e48b6309784161 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Tue, 15 Apr 2025 13:26:27 -0400
Subject: [PATCH 3/4] chore: delete nightly jobs

---
 .kokoro/nightly/graalvm-native-a.cfg | 38 ----------------------------
 .kokoro/nightly/graalvm-native-b.cfg | 38 ----------------------------
 .kokoro/nightly/graalvm-native-c.cfg | 38 ----------------------------
 3 files changed, 114 deletions(-)
 delete mode 100644 .kokoro/nightly/graalvm-native-a.cfg
 delete mode 100644 .kokoro/nightly/graalvm-native-b.cfg
 delete mode 100644 .kokoro/nightly/graalvm-native-c.cfg

diff --git a/.kokoro/nightly/graalvm-native-a.cfg b/.kokoro/nightly/graalvm-native-a.cfg
deleted file mode 100644
index a187fe3e9..000000000
--- a/.kokoro/nightly/graalvm-native-a.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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_a"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "nightly-graalvm"
-}
-
-# 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: "ENABLE_FLAKYBOT"
-  value: "true"
-}
-
-env_vars: {
-  key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-it-service-account"
-}
-
-env_vars: {
-  key: "SECRET_MANAGER_KEYS"
-  value: "java-it-service-account"
-}
diff --git a/.kokoro/nightly/graalvm-native-b.cfg b/.kokoro/nightly/graalvm-native-b.cfg
deleted file mode 100644
index c9053648e..000000000
--- a/.kokoro/nightly/graalvm-native-b.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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_b"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "nightly-graalvm"
-}
-
-# 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: "ENABLE_FLAKYBOT"
-  value: "true"
-}
-
-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
diff --git a/.kokoro/nightly/graalvm-native-c.cfg b/.kokoro/nightly/graalvm-native-c.cfg
deleted file mode 100644
index 96a672d0f..000000000
--- a/.kokoro/nightly/graalvm-native-c.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "nightly-graalvm"
-}
-
-# 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: "ENABLE_FLAKYBOT"
-  value: "true"
-}
-
-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 0d97f0f7f51496ba6ee189bdf2f1d0a814d261ae Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Thu, 24 Apr 2025 12:20:20 -0400
Subject: [PATCH 4/4] chore: update images to the latest

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

diff --git a/.kokoro/continuous/graalvm-native-a.cfg b/.kokoro/continuous/graalvm-native-a.cfg
index 9216250ef..6ae3c9e81 100644
--- a/.kokoro/continuous/graalvm-native-a.cfg
+++ b/.kokoro/continuous/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/continuous/graalvm-native-b.cfg b/.kokoro/continuous/graalvm-native-b.cfg
index edf77587e..821f86cca 100644
--- a/.kokoro/continuous/graalvm-native-b.cfg
+++ b/.kokoro/continuous/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/continuous/graalvm-native-c.cfg b/.kokoro/continuous/graalvm-native-c.cfg
index 801d5d79c..16e3d4ca4 100644
--- a/.kokoro/continuous/graalvm-native-c.cfg
+++ b/.kokoro/continuous/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: {