Skip to content

Commit b5bce9b

Browse files
yoshi-automationchingor13
authored andcommitted
chore: update common templates (#848)
1 parent 5d15646 commit b5bce9b

File tree

7 files changed

+46
-2
lines changed

7 files changed

+46
-2
lines changed

.kokoro/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ case ${JOB_TYPE} in
3939
test)
4040
mvn test -B
4141
bash ${KOKORO_GFILE_DIR}/codecov.sh
42+
bash .kokoro/coerce_logs.sh
4243
;;
4344
lint)
4445
mvn com.coveo:fmt-maven-plugin:check
@@ -48,6 +49,7 @@ javadoc)
4849
;;
4950
integration)
5051
mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -fae verify
52+
bash .kokoro/coerce_logs.sh
5153
;;
5254
*)
5355
;;

.kokoro/coerce_logs.sh

Lines changed: 38 additions & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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/common.cfg

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"updateTime": "2019-10-15T08:01:28.284647Z",
2+
"updateTime": "2019-10-18T07:51:39.452073Z",
33
"sources": [
44
{
55
"template": {
66
"name": "java_library",
77
"origin": "synthtool.gcp",
8-
"version": "2019.5.2"
8+
"version": "2019.10.17"
99
}
1010
}
1111
]

0 commit comments

Comments
 (0)