Skip to content

Commit b1be200

Browse files
authored
chore: publish to two repos (#3479)
In this PR: - Publish library generation image to two image repos. - Rename cloudbuild.yaml since the original trigger is deleted (cl/708074481).
1 parent ae9eb03 commit b1be200

4 files changed

+26
-58
lines changed

.cloudbuild/library_generation/cloudbuild-library-generation-push-prod.yaml

-44
This file was deleted.

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

+23-11
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,29 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_IMAGE_NAME: "gcr.io/cloud-devrel-public-resources/java-library-generation"
1817
_GAPIC_GENERATOR_JAVA_VERSION: '2.51.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
19-
_SHA_IMAGE_ID: "${_IMAGE_NAME}:${COMMIT_SHA}"
20-
_LATEST_IMAGE_ID: "${_IMAGE_NAME}:latest"
21-
_VERSIONED_IMAGE_ID: "${_IMAGE_NAME}:${_GAPIC_GENERATOR_JAVA_VERSION}"
18+
_PRIVATE_IMAGE_NAME: "us-docker.pkg.dev/java-hermetic-build-prod/private-resources/java-library-generation"
19+
_PRIVATE_SHA_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:${COMMIT_SHA}"
20+
_PRIVATE_LATEST_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:latest"
21+
_PRIVATE_VERSIONED_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:${_GAPIC_GENERATOR_JAVA_VERSION}"
22+
_PUBLIC_IMAGE_NAME: "gcr.io/cloud-devrel-public-resources/java-library-generation"
23+
_PUBLIC_SHA_IMAGE_ID: "${_PUBLIC_IMAGE_NAME}:${COMMIT_SHA}"
24+
_PUBLIC_LATEST_IMAGE_ID: "${_PUBLIC_IMAGE_NAME}:latest"
25+
_PUBLIC_VERSIONED_IMAGE_ID: "${_PUBLIC_IMAGE_NAME}:${_GAPIC_GENERATOR_JAVA_VERSION}"
2226
steps:
2327
# Library generation build
2428
- name: gcr.io/cloud-builders/docker
2529
args: [
2630
"build",
27-
"-t", "${_SHA_IMAGE_ID}",
28-
"-t", "${_LATEST_IMAGE_ID}",
29-
"-t", "${_VERSIONED_IMAGE_ID}",
30-
"--file", ".cloudbuild/library_generation/library_generation.Dockerfile", "."]
31+
"-t", "${_PRIVATE_SHA_IMAGE_ID}",
32+
"-t", "${_PRIVATE_LATEST_IMAGE_ID}",
33+
"-t", "${_PRIVATE_VERSIONED_IMAGE_ID}",
34+
"-t", "${_PUBLIC_SHA_IMAGE_ID}",
35+
"-t", "${_PUBLIC_LATEST_IMAGE_ID}",
36+
"-t", "${_PUBLIC_VERSIONED_IMAGE_ID}",
37+
"-f", ".cloudbuild/library_generation/library_generation_airlock.Dockerfile",
38+
"."
39+
]
3140
id: library-generation-build
3241
waitFor: ["-"]
3342
env:
@@ -37,6 +46,9 @@ options:
3746
logging: CLOUD_LOGGING_ONLY
3847

3948
images:
40-
- ${_SHA_IMAGE_ID}
41-
- ${_LATEST_IMAGE_ID}
42-
- ${_VERSIONED_IMAGE_ID}
49+
- ${_PRIVATE_SHA_IMAGE_ID}
50+
- ${_PRIVATE_LATEST_IMAGE_ID}
51+
- ${_PRIVATE_VERSIONED_IMAGE_ID}
52+
- ${_PUBLIC_SHA_IMAGE_ID}
53+
- ${_PUBLIC_LATEST_IMAGE_ID}
54+
- ${_PUBLIC_VERSIONED_IMAGE_ID}

.github/release-please.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ bumpMinorPreMajor: true
33
handleGHRelease: true
44
primaryBranch: main
55
manifest: true
6-
extraFiles: ["WORKSPACE", ".cloudbuild/graalvm/cloudbuild.yaml", ".cloudbuild/graalvm/cloudbuild-test-a.yaml", ".cloudbuild/graalvm/cloudbuild-test-b.yaml", ".cloudbuild/library_generation/cloudbuild-library-generation-release.yaml", "generation_config.yaml"]
6+
extraFiles: ["WORKSPACE", ".cloudbuild/graalvm/cloudbuild.yaml", ".cloudbuild/graalvm/cloudbuild-test-a.yaml", ".cloudbuild/graalvm/cloudbuild-test-b.yaml"]

release-please-config.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
".cloudbuild/graalvm/cloudbuild-test-a.yaml",
1212
".cloudbuild/graalvm/cloudbuild-test-b.yaml",
1313
".cloudbuild/library_generation/cloudbuild-library-generation-push.yaml",
14-
".cloudbuild/library_generation/cloudbuild-library-generation-push-prod.yaml",
15-
".cloudbuild/library_generation/library_generation.Dockerfile"
14+
".cloudbuild/library_generation/library_generation.Dockerfile",
15+
".cloudbuild/library_generation/library_generation_airlock.Dockerfile"
1616
]
1717
}
1818
}

0 commit comments

Comments
 (0)