Skip to content

Commit f0653b8

Browse files
authored
ci: add timestamps to graalvm's mvn setup commands (#2739)
Adds timestamps to the mvn build output, plus minor formatting for shorter lines / easier readability.
1 parent 4d7d246 commit f0653b8

File tree

4 files changed

+46
-11
lines changed

4 files changed

+46
-11
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,14 @@ substitutions:
1818
_JAVA_SHARED_CONFIG_VERSION: '1.7.7'
1919

2020
steps:
21-
# GraalVM A build
2221
- name: gcr.io/cloud-builders/docker
23-
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", "."]
22+
args: [
23+
"build",
24+
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION}",
25+
"--file", "graalvm_a.Dockerfile",
26+
"--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION",
27+
"."
28+
]
2429
dir: .cloudbuild/graalvm
2530
id: graalvm-a-build
2631
waitFor: ["-"]

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,14 @@ substitutions:
1818
_JAVA_SHARED_CONFIG_VERSION: '1.7.7'
1919

2020
steps:
21-
# GraalVM A build
2221
- name: gcr.io/cloud-builders/docker
23-
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", "."]
22+
args: [
23+
"build",
24+
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION}",
25+
"--file", "graalvm_b.Dockerfile",
26+
"--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION",
27+
"."
28+
]
2429
dir: .cloudbuild/graalvm
2530
id: graalvm-b-build
2631
waitFor: ["-"]

.cloudbuild/graalvm/cloudbuild.yaml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,26 @@ substitutions:
1919
steps:
2020
# GraalVM A build
2121
- name: gcr.io/cloud-builders/docker
22-
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", "."]
22+
args: [
23+
"build",
24+
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION}",
25+
"--file", "graalvm_a.Dockerfile",
26+
"--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION",
27+
"."
28+
]
2329
dir: .cloudbuild/graalvm
2430
id: graalvm-a-build
25-
waitFor: ["-"]
31+
waitFor: [ "-" ]
2632

2733
# GraalVM B build
2834
- name: gcr.io/cloud-builders/docker
29-
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", "." ]
35+
args: [
36+
"build",
37+
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION}",
38+
"--file", "graalvm_b.Dockerfile",
39+
"--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION",
40+
"."
41+
]
3042
dir: .cloudbuild/graalvm
3143
id: graalvm-b-build
3244
waitFor: [ "-" ]

.kokoro/presubmit/downstream-build.sh

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,13 @@ cp settings.xml "${HOME}/.m2"
3636

3737
### Round 1
3838
# Publish this repo's modules to local maven to make them available for downstream libraries
39-
mvn -B -ntp install --projects '!gapic-generator-java' \
40-
-Dcheckstyle.skip -Dfmt.skip -DskipTests
39+
mvn install --projects '!gapic-generator-java' \
40+
-Dcheckstyle.skip \
41+
-Dfmt.skip \
42+
-DskipTests \
43+
-B -ntp \
44+
-Dorg.slf4j.simpleLogger.showDateTime=true \
45+
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS
4146

4247
SHARED_DEPS_VERSION=$(parse_pom_version java-shared-dependencies)
4348

@@ -47,14 +52,22 @@ SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -Dfo
4752
popd
4853
# Start showcase server
4954
mkdir -p /usr/src/showcase
50-
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
55+
curl \
56+
--location https://github.com/googleapis/gapic-showcase/releases/download/v"${SHOWCASE_VERSION}"/gapic-showcase-"${SHOWCASE_VERSION}"-linux-amd64.tar.gz \
57+
--output /usr/src/showcase/showcase-"${SHOWCASE_VERSION}"-linux-amd64.tar.gz
5158
pushd /usr/src/showcase/
5259
tar -xf showcase-*
5360
./gapic-showcase run &
5461
popd
5562
# Run showcase tests with `native` profile
5663
pushd showcase
57-
mvn test -Pnative,-showcase -Denforcer.skip=true -ntp -B
64+
mvn test -Pnative,-showcase \
65+
-Denforcer.skip=true \
66+
-Dcheckstyle.skip \
67+
-Dfmt.skip \
68+
-ntp -B \
69+
-Dorg.slf4j.simpleLogger.showDateTime=true \
70+
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS
5871
popd
5972

6073
### Round 3

0 commit comments

Comments
 (0)