chore: use layer 2 docker images and sdk-platform-java-config

googleapis · Jan 2, 2024 · 26f4147 · 26f4147
1 parent f2f275e
commit 26f4147
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 13 deletions.
diff --git a/.kokoro/nightly/graalvm-native-17.cfg b/.kokoro/nightly/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.3"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.21.0"
 }
 
 env_vars: {

diff --git a/.kokoro/nightly/graalvm-native.cfg b/.kokoro/nightly/graalvm-native.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_sdk_platform_a:3.21.0"
 }
 
 env_vars: {

diff --git a/.kokoro/nightly/graalvm-sub-jobs/native-17/common.cfg b/.kokoro/nightly/graalvm-sub-jobs/native-17/common.cfg
@@ -24,7 +24,7 @@ env_vars: {
 
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.3"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.21.0"
 }
 
 env_vars: {

diff --git a/.kokoro/nightly/graalvm-sub-jobs/native/common.cfg b/.kokoro/nightly/graalvm-sub-jobs/native/common.cfg
@@ -29,7 +29,7 @@ env_vars: {
 
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.21.0"
 }
 
 # TODO: remove this after we've migrated all tests and scripts

diff --git a/.kokoro/presubmit/graalvm-native-17-presubmit.cfg b/.kokoro/presubmit/graalvm-native-17-presubmit.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.3"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.21.0"
 }
 
 env_vars: {

diff --git a/.kokoro/presubmit/graalvm-native-presubmit.cfg b/.kokoro/presubmit/graalvm-native-presubmit.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_sdk_platform_a:3.21.0"
 }
 
 env_vars: {

diff --git a/google-cloud-pom-parent/pom.xml b/google-cloud-pom-parent/pom.xml
@@ -14,8 +14,8 @@
   </description>
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.6.1</version>
+    <artifactId>sdk-platform-java-config</artifactId>
+    <version>3.21.0</version>
     <relativePath/>
   </parent>
 

diff --git a/...ostprocessor/synthtool/gcp/templates/java_library/.kokoro/presubmit/graalvm-native-17.cfg b/...ostprocessor/synthtool/gcp/templates/java_library/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.21.0"
 }
 
 env_vars: {

diff --git a/renovate.json b/renovate.json
@@ -28,10 +28,9 @@
         "^.kokoro/nightly/graalvm-sub-jobs/native.*/common.cfg$",
         "^owl-bot-postprocessor/synthtool/gcp/templates/java-library/.kokoro/presubmit/graalvm-native.*.cfg$"
       ],
-      "matchStrings": ["value: \"gcr.io/cloud-devrel-kokoro-resources/graalvm:(?<currentValue>.*?)\"",
-        "value: \"gcr.io/cloud-devrel-kokoro-resources/graalvm17:(?<currentValue>.*?)\""],
-      "depNameTemplate": "ghcr.io/graalvm/graalvm-ce",
-      "datasourceTemplate": "docker"
+      "matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform.*:(?<currentValue>.*?)\""],
+      "depNameTemplate": "com.google.cloud:google-cloud-shared-dependencies",
+      "datasourceTemplate": "maven"
     },
     {
       "fileMatch": ["README.md"],