Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 16ffb5f

Browse files
yoshi-automationchingor13
authored andcommitted
build: update common templates (#4)
1 parent ed44eb5 commit 16ffb5f

File tree

8 files changed

+69
-8
lines changed

8 files changed

+69
-8
lines changed

.kokoro/build.sh

+8-2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ echo ${JOB_TYPE}
2626

2727
mvn install -B -V \
2828
-DskipTests=true \
29+
-Dclirr.skip=true \
2930
-Dmaven.javadoc.skip=true \
3031
-Dgcloud.download.skip=true \
3132
-T 1C
@@ -37,8 +38,9 @@ fi
3738

3839
case ${JOB_TYPE} in
3940
test)
40-
mvn test -B
41+
mvn test -B -Dclirr.skip=true
4142
bash ${KOKORO_GFILE_DIR}/codecov.sh
43+
bash .kokoro/coerce_logs.sh
4244
;;
4345
lint)
4446
mvn com.coveo:fmt-maven-plugin:check
@@ -47,7 +49,11 @@ javadoc)
4749
mvn javadoc:javadoc javadoc:test-javadoc
4850
;;
4951
integration)
50-
mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -fae verify
52+
mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -Dclirr.skip=true -fae verify
53+
bash .kokoro/coerce_logs.sh
54+
;;
55+
clirr)
56+
mvn -B clirr:check
5157
;;
5258
*)
5359
;;

.kokoro/coerce_logs.sh

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/bin/bash
2+
# Copyright 2019 Google LLC
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
# This script finds and moves sponge logs so that they can be found by placer
17+
# and are not flagged as flaky by sponge.
18+
19+
set -eo pipefail
20+
21+
## Get the directory of the build script
22+
scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
23+
## cd to the parent directory, i.e. the root of the git repo
24+
cd ${scriptDir}/..
25+
26+
job=$(basename ${KOKORO_JOB_NAME})
27+
28+
echo "coercing sponge logs..."
29+
for xml in `find . -name *-sponge_log.xml`
30+
do
31+
echo "processing ${xml}"
32+
class=$(basename ${xml} | cut -d- -f2)
33+
dir=$(dirname ${xml})/${job}/${class}
34+
text=$(dirname ${xml})/${class}-sponge_log.txt
35+
mkdir -p ${dir}
36+
mv ${xml} ${dir}/sponge_log.xml
37+
mv ${text} ${dir}/sponge_log.txt
38+
done

.kokoro/continuous/common.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
action {
55
define_artifacts {
66
regex: "**/*sponge_log.xml"
7+
regex: "**/*sponge_log.txt"
78
}
89
}
910

.kokoro/nightly/common.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
action {
55
define_artifacts {
66
regex: "**/*sponge_log.xml"
7+
regex: "**/*sponge_log.txt"
78
}
89
}
910

.kokoro/presubmit/clirr.cfg

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
5+
env_vars: {
6+
key: "TRAMPOLINE_IMAGE"
7+
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
8+
}
9+
10+
env_vars: {
11+
key: "JOB_TYPE"
12+
value: "clirr"
13+
}

.kokoro/presubmit/common.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
action {
55
define_artifacts {
66
regex: "**/*sponge_log.xml"
7+
regex: "**/*sponge_log.txt"
78
}
89
}
910

.kokoro/release/stage.sh

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ create_settings_xml_file "settings.xml"
2828

2929
mvn clean install deploy -B \
3030
--settings ${MAVEN_SETTINGS_FILE} \
31+
-DskipTests=true \
3132
-DperformRelease=true \
3233
-Dgpg.executable=gpg \
3334
-Dgpg.passphrase=${GPG_PASSPHRASE} \

synth.metadata

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{
2-
"updateTime": "2019-10-15T22:31:17.035125Z",
2+
"updateTime": "2019-10-19T07:59:16.274252Z",
33
"sources": [
44
{
55
"generator": {
66
"name": "artman",
7-
"version": "0.39.0",
8-
"dockerImage": "googleapis/artman@sha256:72554d0b3bdc0b4ac7d6726a6a606c00c14b454339037ed86be94574fb05d9f3"
7+
"version": "0.40.1",
8+
"dockerImage": "googleapis/artman@sha256:168646efbffe41e8f8fa86a60fa0d5724fab67fa37f35082cf6cfc85cedce3c7"
99
}
1010
},
1111
{
1212
"git": {
1313
"name": "googleapis",
1414
"remote": "https://github.com/googleapis/googleapis.git",
15-
"sha": "c6e62c7e5e61e6dae7fdc3bc3de81f60e6a9445c",
16-
"internalRef": "274798600"
15+
"sha": "0e9a6d15fcb944ed40921ba0aad2082ee1bc7edd",
16+
"internalRef": "275543900"
1717
}
1818
},
1919
{
2020
"template": {
2121
"name": "java_library",
2222
"origin": "synthtool.gcp",
23-
"version": "2019.5.2"
23+
"version": "2019.10.17"
2424
}
2525
}
2626
],

0 commit comments

Comments
 (0)