From c009e105bc8afdcfa2828760a03a927be115807c Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 8 Jan 2024 17:34:11 +0000 Subject: [PATCH] chore: use layer 2 docker images and inherit sdk-platform-java-config as the parent (#10184) * chore: use layer 2 docker images and sdk-platform-java-config --- .kokoro/nightly/graalvm-native-17.cfg | 2 +- .kokoro/nightly/graalvm-native.cfg | 2 +- .kokoro/nightly/graalvm-sub-jobs/native-17/common.cfg | 2 +- .kokoro/nightly/graalvm-sub-jobs/native/common.cfg | 2 +- .kokoro/presubmit/graalvm-native-17-presubmit.cfg | 2 +- .kokoro/presubmit/graalvm-native-presubmit.cfg | 2 +- google-cloud-jar-parent/pom.xml | 2 +- google-cloud-pom-parent/pom.xml | 4 ++-- .../java_library/.kokoro/presubmit/graalvm-native-17.cfg | 2 +- renovate.json | 7 +++---- 10 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.kokoro/nightly/graalvm-native-17.cfg b/.kokoro/nightly/graalvm-native-17.cfg index b708e7d550b9..e6df521091f2 100644 --- 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 index fb9274a7da26..1d791ada7079 100644 --- 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 index 57df754c2597..bf5beee1ed8b 100644 --- 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 index dbd3ca8eade1..d6b22840e298 100644 --- 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 index d22f4154e76e..6cc9fb3030af 100644 --- 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 index 1d4f2ba81e5b..6049567b6c3e 100644 --- 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-jar-parent/pom.xml b/google-cloud-jar-parent/pom.xml index 9594217f71d6..5b9def16f844 100644 --- a/google-cloud-jar-parent/pom.xml +++ b/google-cloud-jar-parent/pom.xml @@ -27,7 +27,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.20.0 + ${google-cloud-shared-dependencies.version} pom import diff --git a/google-cloud-pom-parent/pom.xml b/google-cloud-pom-parent/pom.xml index d03dbfbfdd91..d8809e12583e 100644 --- a/google-cloud-pom-parent/pom.xml +++ b/google-cloud-pom-parent/pom.xml @@ -14,8 +14,8 @@ com.google.cloud - google-cloud-shared-config - 1.6.1 + sdk-platform-java-config + 3.21.0 diff --git a/owl-bot-postprocessor/synthtool/gcp/templates/java_library/.kokoro/presubmit/graalvm-native-17.cfg b/owl-bot-postprocessor/synthtool/gcp/templates/java_library/.kokoro/presubmit/graalvm-native-17.cfg index a3f7fb9d4943..c4145bc8fa70 100644 --- a/owl-bot-postprocessor/synthtool/gcp/templates/java_library/.kokoro/presubmit/graalvm-native-17.cfg +++ b/owl-bot-postprocessor/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 index 16fa92d3c088..5596a243f8e6 100644 --- 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:(?.*?)\"", - "value: \"gcr.io/cloud-devrel-kokoro-resources/graalvm17:(?.*?)\""], - "depNameTemplate": "ghcr.io/graalvm/graalvm-ce", - "datasourceTemplate": "docker" + "matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform.*:(?.*?)\""], + "depNameTemplate": "com.google.cloud:sdk-platform-java-config", + "datasourceTemplate": "maven" }, { "fileMatch": ["README.md"],