Skip to content

Commit 3df39fa

Browse files
zhumin8zhumin8
authored
Merge branch 'main' into client-log
2 parents c2b607b + 0effb37 commit 3df39fa

File tree

121 files changed

+1361
-1082
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+1361
-1082
lines changed

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

Lines changed: 2 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.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.2'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY
@@ -45,4 +45,4 @@ steps:
4545
id: native-java-kms
4646
env:
4747
- 'MODULES_UNDER_TEST=java-kms'
48-
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
48+
- 'GOOGLE_CLOUD_PROJECT=java-graalvm-ci-prod'

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

Lines changed: 2 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.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.2'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY
@@ -45,4 +45,4 @@ steps:
4545
id: native-java-kmsinventory
4646
env:
4747
- 'MODULES_UNDER_TEST=java-kmsinventory'
48-
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
48+
- 'GOOGLE_CLOUD_PROJECT=java-graalvm-ci-prod'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.39.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
17+
_SHARED_DEPENDENCIES_VERSION: '3.40.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.2'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

Lines changed: 2 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.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.2'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY
@@ -44,4 +44,4 @@ steps:
4444
waitFor: [ "graalvm-b-build" ]
4545
env:
4646
- 'MODULES_UNDER_TEST=java-kms'
47-
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
47+
- 'GOOGLE_CLOUD_PROJECT=java-graalvm-ci-prod'

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

Lines changed: 2 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.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.2'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY
@@ -45,4 +45,4 @@ steps:
4545
id: native-java-kmsinventory
4646
env:
4747
- 'MODULES_UNDER_TEST=java-kmsinventory'
48-
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
48+
- 'GOOGLE_CLOUD_PROJECT=java-graalvm-ci-prod'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.39.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
17+
_SHARED_DEPENDENCIES_VERSION: '3.40.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.2'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

‎.cloudbuild/graalvm/cloudbuild.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.39.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
17+
_SHARED_DEPENDENCIES_VERSION: '3.40.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.2'
1919
steps:
2020
# GraalVM A build
2121
- name: gcr.io/cloud-builders/docker

‎.cloudbuild/graalvm/graalvm_a.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515

1616
ARG JAVA_SHARED_CONFIG_VERSION
1717

18-
FROM gcr.io/cloud-devrel-public-resources/graalvm_a:$JAVA_SHARED_CONFIG_VERSION
18+
FROM us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:$JAVA_SHARED_CONFIG_VERSION
1919

‎.cloudbuild/graalvm/graalvm_b.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515

1616
ARG JAVA_SHARED_CONFIG_VERSION
1717

18-
FROM gcr.io/cloud-devrel-public-resources/graalvm_b:$JAVA_SHARED_CONFIG_VERSION
18+
FROM us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:$JAVA_SHARED_CONFIG_VERSION

‎.cloudbuild/library_generation/cloudbuild-library-generation-push-prod.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
_IMAGE_NAME: "us-docker.pkg.dev/java-hermetic-build-prod/private-resources/java-library-generation"
18-
_GAPIC_GENERATOR_JAVA_VERSION: '2.49.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
18+
_GAPIC_GENERATOR_JAVA_VERSION: '2.50.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
1919
_SHA_IMAGE_ID: "${_IMAGE_NAME}:${COMMIT_SHA}"
2020
_LATEST_IMAGE_ID: "${_IMAGE_NAME}:latest"
2121
_VERSIONED_IMAGE_ID: "${_IMAGE_NAME}:${_GAPIC_GENERATOR_JAVA_VERSION}"

0 commit comments

Comments
 (0)