Skip to content

Commit 7c09e23

Browse files
chore: create release cloudbuild yaml for library_generation (#2510)
# In this PR - We add a new `cloudbuild` yaml that is configured to push a new image tagged as `gcr.io/cloud-devrel-public-resources/java-library-generation:${_GAPIC_GENERATOR_JAVA_VERSION}` - We reorganize the folder structure of `sdk-platform-java/.cloudbuild` ## The new trigger It's called `library-generation-sdk-platform-java-release` ![image](https://github.com/googleapis/sdk-platform-java/assets/22083784/b14525c5-fbe9-4d33-9381-4e6cbfae686a) # Before merging this PR - [x] Update _all_ library_generation triggers to point to the new location (`.cloudbuild/library_generation`) - [x] Get approval from @mpeddada1 in order to: - [x] Update graalvm __test__ triggers to point to the new location (`.cloudbuild/graalvm`) - [x] Update graalvm release triggers to point to the new location (`.cloudbuild/graalvm`)
1 parent 2de487b commit 7c09e23

10 files changed

+39
-16
lines changed

.cloudbuild/google-cloud-sdk.repo

Lines changed: 0 additions & 8 deletions
This file was deleted.

.cloudbuild/cloudbuild-test-a.yaml renamed to .cloudbuild/graalvm/cloudbuild-test-a.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ steps:
2121
# GraalVM A build
2222
- name: gcr.io/cloud-builders/docker
2323
args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION}", "--file", "graalvm_a.Dockerfile", "--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION", "."]
24-
dir: .cloudbuild
24+
dir: .cloudbuild/graalvm
2525
id: graalvm-a-build
2626
waitFor: ["-"]
2727
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION}
@@ -30,4 +30,4 @@ steps:
3030
waitFor: [ "graalvm-a-build" ]
3131
env:
3232
- 'MODULES_UNDER_TEST=java-kms'
33-
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
33+
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'

.cloudbuild/cloudbuild-test-b.yaml renamed to .cloudbuild/graalvm/cloudbuild-test-b.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ steps:
2121
# GraalVM A build
2222
- name: gcr.io/cloud-builders/docker
2323
args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION}", "--file", "graalvm_b.Dockerfile", "--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION", "."]
24-
dir: .cloudbuild
24+
dir: .cloudbuild/graalvm
2525
id: graalvm-b-build
2626
waitFor: ["-"]
2727
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION}
@@ -30,4 +30,4 @@ steps:
3030
waitFor: [ "graalvm-b-build" ]
3131
env:
3232
- 'MODULES_UNDER_TEST=java-kms'
33-
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
33+
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'

.cloudbuild/cloudbuild.yaml renamed to .cloudbuild/graalvm/cloudbuild.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ steps:
2020
# GraalVM A build
2121
- name: gcr.io/cloud-builders/docker
2222
args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION}", "--file", "graalvm_a.Dockerfile", "--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION", "."]
23-
dir: .cloudbuild
23+
dir: .cloudbuild/graalvm
2424
id: graalvm-a-build
2525
waitFor: ["-"]
2626

2727
# GraalVM B build
2828
- name: gcr.io/cloud-builders/docker
2929
args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION}", "--file", "graalvm_b.Dockerfile", "--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION", "." ]
30-
dir: .cloudbuild
30+
dir: .cloudbuild/graalvm
3131
id: graalvm-b-build
3232
waitFor: [ "-" ]
3333

.cloudbuild/cloudbuild-library-generation.yaml renamed to .cloudbuild/library_generation/cloudbuild-library-generation-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ steps:
2424
"build",
2525
"-t", "${_SHA_IMAGE_ID}",
2626
"-t", "${_LATEST_IMAGE_ID}",
27-
"--file", ".cloudbuild/library_generation.Dockerfile", "."]
27+
"--file", ".cloudbuild/library_generation/library_generation.Dockerfile", "."]
2828
id: library-generation-build
2929
waitFor: ["-"]
3030

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Copyright 2024 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+
_GAPIC_GENERATOR_JAVA_VERSION: '2.35.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
18+
_IMAGE_ID: "gcr.io/cloud-devrel-public-resources/java-library-generation:${_GAPIC_GENERATOR_JAVA_VERSION}"
19+
steps:
20+
# Library generation build
21+
- name: gcr.io/cloud-builders/docker
22+
args: [
23+
"build",
24+
"-t", "${_IMAGE_ID}",
25+
"--file", ".cloudbuild/library_generation/library_generation.Dockerfile", "."]
26+
id: library-generation-build
27+
waitFor: ["-"]
28+
29+
images:
30+
- ${_IMAGE_ID}
31+

.cloudbuild/cloudbuild-test-library-generation.yaml renamed to .cloudbuild/library_generation/cloudbuild-test-library-generation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ substitutions:
1919
steps:
2020
# Library generation build
2121
- name: gcr.io/cloud-builders/docker
22-
args: ["build", "-t", "${_TEST_IMAGE_ID}", "--file", ".cloudbuild/library_generation.Dockerfile", "."]
22+
args: ["build", "-t", "${_TEST_IMAGE_ID}", "--file", ".cloudbuild/library_generation/library_generation.Dockerfile", "."]
2323
id: library-generation-build
2424
waitFor: ["-"]
2525
- name: ${_TEST_IMAGE_ID}

0 commit comments

Comments
 (0)