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

Commit

Permalink
chore: update common templates (#11)
Browse files Browse the repository at this point in the history
  • Loading branch information
yoshi-automation authored and chingor13 committed Oct 17, 2019
1 parent efb5ec1 commit 938af7c
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .kokoro/build.sh
Expand Up @@ -39,6 +39,7 @@ case ${JOB_TYPE} in
test)
mvn test -B
bash ${KOKORO_GFILE_DIR}/codecov.sh
bash .kokoro/coerce_logs.sh
;;
lint)
mvn com.coveo:fmt-maven-plugin:check
Expand All @@ -48,6 +49,7 @@ javadoc)
;;
integration)
mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -fae verify
bash .kokoro/coerce_logs.sh
;;
*)
;;
Expand Down
36 changes: 36 additions & 0 deletions .kokoro/coerce_logs.sh
@@ -0,0 +1,36 @@
#!/bin/bash
# Copyright 2019 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.

# This script finds and moves sponge logs so that they can be found by placer
# and are not flagged as flaky by sponge.

set -eo pipefail

## Get the directory of the build script
scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
## cd to the parent directory, i.e. the root of the git repo
cd ${scriptDir}/..

echo "coercing sponge logs..."
for xml in `find . -name *-sponge_log.xml`
do
echo "processing ${xml}"
class=$(basename ${xml} | cut -d- -f2)
dir=$(dirname ${xml})/${class}
text=$(dirname ${xml})/${class}-sponge_log.txt
mkdir -p ${dir}
mv ${xml} ${dir}/sponge_log.xml
mv ${text} ${dir}/sponge_log.txt
done
1 change: 1 addition & 0 deletions .kokoro/continuous/common.cfg
Expand Up @@ -4,6 +4,7 @@
action {
define_artifacts {
regex: "**/*sponge_log.xml"
regex: "**/*sponge_log.txt"
}
}

Expand Down
1 change: 1 addition & 0 deletions .kokoro/nightly/common.cfg
Expand Up @@ -4,6 +4,7 @@
action {
define_artifacts {
regex: "**/*sponge_log.xml"
regex: "**/*sponge_log.txt"
}
}

Expand Down
1 change: 1 addition & 0 deletions .kokoro/presubmit/common.cfg
Expand Up @@ -4,6 +4,7 @@
action {
define_artifacts {
regex: "**/*sponge_log.xml"
regex: "**/*sponge_log.txt"
}
}

Expand Down
1 change: 1 addition & 0 deletions .kokoro/release/stage.sh
Expand Up @@ -28,6 +28,7 @@ create_settings_xml_file "settings.xml"

mvn clean install deploy -B \
--settings ${MAVEN_SETTINGS_FILE} \
-DskipTests=true \
-DperformRelease=true \
-Dgpg.executable=gpg \
-Dgpg.passphrase=${GPG_PASSPHRASE} \
Expand Down
6 changes: 3 additions & 3 deletions synth.metadata
@@ -1,5 +1,5 @@
{
"updateTime": "2019-10-16T07:55:15.655729Z",
"updateTime": "2019-10-17T18:13:58.679935Z",
"sources": [
{
"generator": {
Expand All @@ -12,8 +12,8 @@
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "c6e62c7e5e61e6dae7fdc3bc3de81f60e6a9445c",
"internalRef": "274798600"
"sha": "a05f640453ac7b4e1361dfceeae15ee6e02317f1",
"internalRef": "275258873"
}
},
{
Expand Down

0 comments on commit 938af7c

Please sign in to comment.