Skip to content

Commit 385873d

Browse files
cindy-pengcindy-peng
authored
Merge branch 'main' into cindy/selective-gapic
2 parents f4c9cf7 + 243b4da commit 385873d

20 files changed

+198
-14
lines changed

‎.cloudbuild/graalvm/cloudbuild-test-a-downstream-kms.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.15.1'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

‎.cloudbuild/graalvm/cloudbuild-test-a-downstream-kmsinventory.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.15.1'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

‎.cloudbuild/graalvm/cloudbuild-test-a.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.45.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.15.1'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

‎.cloudbuild/graalvm/cloudbuild-test-b-downstream-kms.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.15.1'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

‎.cloudbuild/graalvm/cloudbuild-test-b-downstream-kmsinventory.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.15.1'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

‎.cloudbuild/graalvm/cloudbuild-test-b.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.45.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.15.1'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

‎.cloudbuild/graalvm/cloudbuild-test-c-downstream-kms.yaml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Copyright 2025 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
timeout: 7200s # 2 hours
16+
substitutions:
17+
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
19+
options:
20+
machineType: 'E2_HIGHCPU_8'
21+
logging: CLOUD_LOGGING_ONLY
22+
steps:
23+
- name: gcr.io/cloud-builders/docker
24+
args: [
25+
"build",
26+
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}",
27+
"--file", "graalvm_c.Dockerfile",
28+
"--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION",
29+
"."
30+
]
31+
dir: .cloudbuild/graalvm
32+
id: graalvm-c-build
33+
waitFor: ["-"]
34+
35+
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}
36+
waitFor: [ "graalvm-c-build" ]
37+
entrypoint: java
38+
args: [ '-version' ]
39+
id: java-version
40+
41+
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}
42+
entrypoint: bash
43+
args: [ './.kokoro/presubmit/downstream-build.sh' ]
44+
waitFor: [ "graalvm-c-build" ]
45+
id: native-java-kms
46+
env:
47+
- 'MODULES_UNDER_TEST=java-kms'
48+
- 'GOOGLE_CLOUD_PROJECT=java-graalvm-ci-prod'

‎.cloudbuild/graalvm/cloudbuild-test-c-downstream-kmsinventory.yaml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Copyright 2025 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
timeout: 7200s # 2 hours
16+
substitutions:
17+
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
19+
options:
20+
machineType: 'E2_HIGHCPU_8'
21+
logging: CLOUD_LOGGING_ONLY
22+
steps:
23+
- name: gcr.io/cloud-builders/docker
24+
args: [
25+
"build",
26+
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}",
27+
"--file", "graalvm_c.Dockerfile",
28+
"--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION",
29+
"."
30+
]
31+
dir: .cloudbuild/graalvm
32+
id: graalvm-c-build
33+
waitFor: ["-"]
34+
35+
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}
36+
waitFor: [ "graalvm-c-build" ]
37+
entrypoint: java
38+
args: [ '-version' ]
39+
id: java-version
40+
41+
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}
42+
entrypoint: bash
43+
args: [ './.kokoro/presubmit/downstream-build.sh' ]
44+
waitFor: [ "graalvm-c-build" ]
45+
id: native-java-kmsinventory
46+
env:
47+
- 'MODULES_UNDER_TEST=java-kmsinventory'
48+
- 'GOOGLE_CLOUD_PROJECT=java-graalvm-ci-prod'

‎.cloudbuild/graalvm/cloudbuild-test-c.yaml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Copyright 2025 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
timeout: 7200s # 2 hours
16+
substitutions:
17+
_SHARED_DEPENDENCIES_VERSION: '3.45.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
19+
options:
20+
machineType: 'E2_HIGHCPU_8'
21+
logging: CLOUD_LOGGING_ONLY
22+
steps:
23+
- name: gcr.io/cloud-builders/docker
24+
args: [
25+
"build",
26+
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}",
27+
"--file", "graalvm_c.Dockerfile",
28+
"--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION",
29+
"."
30+
]
31+
dir: .cloudbuild/graalvm
32+
id: graalvm-c-build
33+
waitFor: ["-"]
34+
35+
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}
36+
waitFor: [ "graalvm-c-build" ]
37+
entrypoint: java
38+
args: [ '-version' ]
39+
id: java-version
40+
41+
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}
42+
entrypoint: bash
43+
args: [ './.kokoro/presubmit/showcase-native.sh' ]
44+
waitFor: [ "graalvm-c-build" ]
45+
id: native-showcase

‎.cloudbuild/graalvm/cloudbuild.yaml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.45.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.15.1'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
steps:
2020
# GraalVM A build
2121
- name: gcr.io/cloud-builders/docker
@@ -45,11 +45,27 @@ steps:
4545
id: graalvm-b-build
4646
waitFor: [ "-" ]
4747

48+
# GraalVM C build
49+
- name: gcr.io/cloud-builders/docker
50+
args: [
51+
"build",
52+
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}",
53+
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:infrastructure-public-image-$SHORT_SHA",
54+
"--file", "graalvm_c.Dockerfile",
55+
"--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION",
56+
"."
57+
]
58+
dir: .cloudbuild/graalvm
59+
id: graalvm-c-build
60+
waitFor: [ "-" ]
61+
4862
options:
4963
logging: CLOUD_LOGGING_ONLY
5064

5165
images:
5266
- gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION}
5367
- gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION}
68+
- gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}
5469
- gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:infrastructure-public-image-$SHORT_SHA
55-
- gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:infrastructure-public-image-$SHORT_SHA
70+
- gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:infrastructure-public-image-$SHORT_SHA
71+
- gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:infrastructure-public-image-$SHORT_SHA

0 commit comments

Comments
 (0)