Skip to content

Commit

Permalink
chore: create release cloudbuild yaml for library_generation (#2510)
Browse files Browse the repository at this point in the history
# 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`)
  • Loading branch information
diegomarquezp authored Feb 28, 2024
1 parent 2de487b commit 7c09e23
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 16 deletions.
8 changes: 0 additions & 8 deletions .cloudbuild/google-cloud-sdk.repo

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ steps:
# GraalVM A build
- name: gcr.io/cloud-builders/docker
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", "."]
dir: .cloudbuild
dir: .cloudbuild/graalvm
id: graalvm-a-build
waitFor: ["-"]
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION}
Expand All @@ -30,4 +30,4 @@ steps:
waitFor: [ "graalvm-a-build" ]
env:
- 'MODULES_UNDER_TEST=java-kms'
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ steps:
# GraalVM A build
- name: gcr.io/cloud-builders/docker
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", "."]
dir: .cloudbuild
dir: .cloudbuild/graalvm
id: graalvm-b-build
waitFor: ["-"]
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION}
Expand All @@ -30,4 +30,4 @@ steps:
waitFor: [ "graalvm-b-build" ]
env:
- 'MODULES_UNDER_TEST=java-kms'
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ steps:
# GraalVM A build
- name: gcr.io/cloud-builders/docker
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", "."]
dir: .cloudbuild
dir: .cloudbuild/graalvm
id: graalvm-a-build
waitFor: ["-"]

# GraalVM B build
- name: gcr.io/cloud-builders/docker
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", "." ]
dir: .cloudbuild
dir: .cloudbuild/graalvm
id: graalvm-b-build
waitFor: [ "-" ]

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ steps:
"build",
"-t", "${_SHA_IMAGE_ID}",
"-t", "${_LATEST_IMAGE_ID}",
"--file", ".cloudbuild/library_generation.Dockerfile", "."]
"--file", ".cloudbuild/library_generation/library_generation.Dockerfile", "."]
id: library-generation-build
waitFor: ["-"]

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Copyright 2024 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

timeout: 7200s # 2 hours
substitutions:
_GAPIC_GENERATOR_JAVA_VERSION: '2.35.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
_IMAGE_ID: "gcr.io/cloud-devrel-public-resources/java-library-generation:${_GAPIC_GENERATOR_JAVA_VERSION}"
steps:
# Library generation build
- name: gcr.io/cloud-builders/docker
args: [
"build",
"-t", "${_IMAGE_ID}",
"--file", ".cloudbuild/library_generation/library_generation.Dockerfile", "."]
id: library-generation-build
waitFor: ["-"]

images:
- ${_IMAGE_ID}

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ substitutions:
steps:
# Library generation build
- name: gcr.io/cloud-builders/docker
args: ["build", "-t", "${_TEST_IMAGE_ID}", "--file", ".cloudbuild/library_generation.Dockerfile", "."]
args: ["build", "-t", "${_TEST_IMAGE_ID}", "--file", ".cloudbuild/library_generation/library_generation.Dockerfile", "."]
id: library-generation-build
waitFor: ["-"]
- name: ${_TEST_IMAGE_ID}
Expand Down
File renamed without changes.

0 comments on commit 7c09e23

Please sign in to comment.