-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into junit-migrate
- Loading branch information
Showing
12 changed files
with
269 additions
and
193 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| # 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: | ||
| _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current} | ||
| _JAVA_SHARED_CONFIG_VERSION: '1.7.7' | ||
|
|
||
| steps: | ||
| - 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/graalvm | ||
| id: graalvm-a-build | ||
| waitFor: ["-"] | ||
|
|
||
| - name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION} | ||
| waitFor: [ "graalvm-a-build" ] | ||
| entrypoint: java | ||
| args: [ '-version' ] | ||
| id: java-version | ||
|
|
||
| - name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION} | ||
| entrypoint: bash | ||
| args: [ './.kokoro/presubmit/downstream-build.sh' ] | ||
| waitFor: [ "graalvm-a-build" ] | ||
| id: native-java-kms | ||
| env: | ||
| - 'MODULES_UNDER_TEST=java-kms' | ||
| - 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test' |
46 changes: 46 additions & 0 deletions
46
.cloudbuild/graalvm/cloudbuild-test-a-downstream-kmsinventory.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| # 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: | ||
| _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current} | ||
| _JAVA_SHARED_CONFIG_VERSION: '1.7.7' | ||
|
|
||
| steps: | ||
| - 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/graalvm | ||
| id: graalvm-a-build | ||
| waitFor: ["-"] | ||
|
|
||
| - name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION} | ||
| waitFor: [ "graalvm-a-build" ] | ||
| entrypoint: java | ||
| args: [ '-version' ] | ||
| id: java-version | ||
|
|
||
| - name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION} | ||
| entrypoint: bash | ||
| args: [ './.kokoro/presubmit/downstream-build.sh' ] | ||
| waitFor: [ "graalvm-a-build" ] | ||
| id: native-java-kmsinventory | ||
| env: | ||
| - 'MODULES_UNDER_TEST=java-kmsinventory' | ||
| - 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| # 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: | ||
| _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current} | ||
| _JAVA_SHARED_CONFIG_VERSION: '1.7.7' | ||
|
|
||
| steps: | ||
| - 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/graalvm | ||
| id: graalvm-b-build | ||
| waitFor: ["-"] | ||
|
|
||
| - name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION} | ||
| waitFor: [ "graalvm-b-build" ] | ||
| entrypoint: java | ||
| args: [ '-version' ] | ||
| id: java-version | ||
|
|
||
| - name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION} | ||
| entrypoint: bash | ||
| args: [ './.kokoro/presubmit/downstream-build.sh' ] | ||
| waitFor: [ "graalvm-b-build" ] | ||
| env: | ||
| - 'MODULES_UNDER_TEST=java-kms' | ||
| - 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test' |
46 changes: 46 additions & 0 deletions
46
.cloudbuild/graalvm/cloudbuild-test-b-downstream-kmsinventory.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| # 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: | ||
| _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current} | ||
| _JAVA_SHARED_CONFIG_VERSION: '1.7.7' | ||
|
|
||
| steps: | ||
| - 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/graalvm | ||
| id: graalvm-b-build | ||
| waitFor: ["-"] | ||
|
|
||
| - name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION} | ||
| waitFor: [ "graalvm-b-build" ] | ||
| entrypoint: java | ||
| args: [ '-version' ] | ||
| id: java-version | ||
|
|
||
| - name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION} | ||
| entrypoint: bash | ||
| args: [ './.kokoro/presubmit/downstream-build.sh' ] | ||
| waitFor: [ "graalvm-b-build" ] | ||
| id: native-java-kmsinventory | ||
| env: | ||
| - 'MODULES_UNDER_TEST=java-kmsinventory' | ||
| - 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| #!/bin/bash | ||
| # 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. | ||
|
|
||
| set -eo pipefail | ||
|
|
||
| ## Get the directory of the build script | ||
| scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")") | ||
| cd "${scriptDir}/../.." # git repo root | ||
| source "$scriptDir/common.sh" | ||
|
|
||
| # Use GCP Maven Mirror | ||
| mkdir -p "${HOME}/.m2" | ||
| cp settings.xml "${HOME}/.m2" | ||
|
|
||
| # Publish this repo's modules to local maven to make them available for downstream libraries | ||
| mvn install --projects '!gapic-generator-java' \ | ||
| -Danimal.sniffer.skip \ | ||
| -Dcheckstyle.skip \ | ||
| -Dclirr.skip \ | ||
| -Dfmt.skip \ | ||
| -DskipTests \ | ||
| -B -ntp \ | ||
| -Dorg.slf4j.simpleLogger.showDateTime=true \ | ||
| -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS | ||
|
|
||
| SHARED_DEPS_VERSION=$(parse_pom_version java-shared-dependencies) | ||
|
|
||
| # Run showcase integration tests in GraalVM | ||
| pushd showcase/gapic-showcase | ||
| SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout) | ||
| popd | ||
| # Start showcase server | ||
| mkdir -p /usr/src/showcase | ||
| curl \ | ||
| --location https://github.com/googleapis/gapic-showcase/releases/download/v"${SHOWCASE_VERSION}"/gapic-showcase-"${SHOWCASE_VERSION}"-linux-amd64.tar.gz \ | ||
| --output /usr/src/showcase/showcase-"${SHOWCASE_VERSION}"-linux-amd64.tar.gz | ||
| pushd /usr/src/showcase/ | ||
| tar -xf showcase-* | ||
| ./gapic-showcase run & | ||
| popd | ||
|
|
||
| # Run showcase tests with `native` profile | ||
| pushd showcase | ||
| mvn test -Pnative,-showcase \ | ||
| -Denforcer.skip=true \ | ||
| -Dcheckstyle.skip \ | ||
| -Dfmt.skip \ | ||
| -ntp -B \ | ||
| -Dorg.slf4j.simpleLogger.showDateTime=true \ | ||
| -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS | ||
| popd |
Oops, something went wrong.