chore: make kokoro cfgs version agnostic (#1344)

* chore: make kokoro cfgs version agnostic
googleapis · Dec 18, 2023 · 5f0628c · 5f0628c
1 parent 9e6cdb9
commit 5f0628c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -70,12 +70,12 @@ integration)
       verify
     RETURN_CODE=$?
     ;;
-graalvm)
+graalvmA)
     # Run Unit and Integration Tests with Native Image
     mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-test test -pl 'oauth2_http'
     RETURN_CODE=$?
     ;;
-graalvm17)
+graalvmB)
     # Run Unit and Integration Tests with Native Image
     mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-test test -pl 'oauth2_http'
     RETURN_CODE=$?

diff --git a/.kokoro/presubmit/graalvm-native.cfg → .kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native.cfg → .kokoro/presubmit/graalvm-native-a.cfg
@@ -3,12 +3,12 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.2"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_a:1.7.1"
 }
 
 env_vars: {
   key: "JOB_TYPE"
-  value: "graalvm"
+  value: "graalvmA"
 }
 
 # TODO: remove this after we've migrated all tests and scripts

diff --git a/.kokoro/presubmit/graalvm-native-17.cfg → .kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-17.cfg → .kokoro/presubmit/graalvm-native-b.cfg
@@ -3,12 +3,12 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.2"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_b:1.7.1"
 }
 
 env_vars: {
   key: "JOB_TYPE"
-  value: "graalvm17"
+  value: "graalvmB"
 }
 
 # TODO: remove this after we've migrated all tests and scripts

diff --git 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.*:(?<currentValue>.*?)\""],
+      "depNameTemplate": "com.google.cloud:google-cloud-shared-config",
+      "datasourceTemplate": "maven"
+    }
+  ],
   "packageRules": [
     {
       "packagePatterns": [