From 1b5a9dc1f786e26e436c7e6fb575fc242d8a0f88 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Mon, 14 Apr 2025 19:53:59 -0400 Subject: [PATCH 1/2] build: introduce GraalVM "C" testing --- .kokoro/build.sh | 15 --------- .kokoro/presubmit/graalvm-native-17.cfg | 33 ------------------- .kokoro/presubmit/graalvm-native-a.cfg | 2 +- .kokoro/presubmit/graalvm-native-b.cfg | 2 +- ...raalvm-native.cfg => graalvm-native-c.cfg} | 10 +++--- 5 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 .kokoro/presubmit/graalvm-native-17.cfg rename .kokoro/presubmit/{graalvm-native.cfg => graalvm-native-c.cfg} (72%) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index f8a1754b6..8fc8df860 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -70,21 +70,6 @@ integration) RETURN_CODE=$? ;; graalvm) - # Run Unit and Integration Tests with Native Image - 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=$? - ;; -graalvmA) - # Run Unit and Integration Tests with Native Image - 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,native-tests,native-deps test -pl '!google-http-client-appengine' RETURN_CODE=$? diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg deleted file mode 100644 index fb5bb678f..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-kokoro-resources/graalvm17:22.3.3" -} - -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 diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg index 1f4b4493c..05cf4c4c4 100644 --- a/.kokoro/presubmit/graalvm-native-a.cfg +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -4,7 +4,7 @@ build_file: "google-http-java-client/.kokoro/build.sh" env_vars: { key: "JOB_TYPE" - value: "graalvmA" + value: "graalvm" } # TODO: remove this after we've migrated all tests and scripts diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg index 1a8dec5aa..809b7e7b8 100644 --- a/.kokoro/presubmit/graalvm-native-b.cfg +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -4,7 +4,7 @@ build_file: "google-http-java-client/.kokoro/build.sh" env_vars: { key: "JOB_TYPE" - value: "graalvmB" + value: "graalvm" } # TODO: remove this after we've migrated all tests and scripts diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native-c.cfg similarity index 72% rename from .kokoro/presubmit/graalvm-native.cfg rename to .kokoro/presubmit/graalvm-native-c.cfg index 59efee340..7fcf05769 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -1,10 +1,6 @@ # 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:22.3.3" -} +build_file: "google-http-java-client/.kokoro/build.sh" env_vars: { key: "JOB_TYPE" @@ -31,3 +27,7 @@ env_vars: { key: "SECRET_MANAGER_KEYS" value: "java-it-service-account" } + +container_properties { + docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_c:1.14.0" +} From fbc40b3e960226809613edc48977b1f0c9ff9696 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Wed, 16 Apr 2025 12:11:31 -0400 Subject: [PATCH 2/2] chore: use latest image c version --- .kokoro/presubmit/graalvm-native-c.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg index 7fcf05769..f518dc865 100644 --- a/.kokoro/presubmit/graalvm-native-c.cfg +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -29,5 +29,5 @@ env_vars: { } container_properties { - docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_c:1.14.0" + docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_c:1.15.4" }