Skip to content

Commit

Permalink
chore: use layer 2 docker images and inherit sdk-platform-java-config…
Browse files Browse the repository at this point in the history
… as the parent (#10184)

* chore: use layer 2 docker images and sdk-platform-java-config
mpeddada1 authored Jan 8, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent e4107b2 commit c009e10
Showing 10 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .kokoro/nightly/graalvm-native-17.cfg
Original file line number Diff line number Diff line change
@@ -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: {
2 changes: 1 addition & 1 deletion .kokoro/nightly/graalvm-native.cfg
Original file line number Diff line number Diff line change
@@ -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: {
2 changes: 1 addition & 1 deletion .kokoro/nightly/graalvm-sub-jobs/native-17/common.cfg
Original file line number Diff line number Diff line change
@@ -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: {
2 changes: 1 addition & 1 deletion .kokoro/nightly/graalvm-sub-jobs/native/common.cfg
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-17-presubmit.cfg
Original file line number Diff line number Diff line change
@@ -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: {
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-presubmit.cfg
Original file line number Diff line number Diff line change
@@ -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: {
2 changes: 1 addition & 1 deletion google-cloud-jar-parent/pom.xml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>3.20.0</version>
<version>${google-cloud-shared-dependencies.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
4 changes: 2 additions & 2 deletions google-cloud-pom-parent/pom.xml
Original file line number Diff line number Diff line change
@@ -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>

Original file line number Diff line number Diff line change
@@ -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: {
7 changes: 3 additions & 4 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -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:sdk-platform-java-config",
"datasourceTemplate": "maven"
},
{
"fileMatch": ["README.md"],

0 comments on commit c009e10

Please sign in to comment.