Skip to content

Commit c99864b

Browse files
chore: update common templates
1 parent e6ec261 commit c99864b

File tree

2 files changed

+23
-5
lines changed

2 files changed

+23
-5
lines changed

.kokoro/build.sh

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,24 @@ if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTI
3737
export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS})
3838
fi
3939

40+
RETURN_CODE=0
41+
set +e
42+
4043
case ${JOB_TYPE} in
4144
test)
4245
mvn test -B -Dclirr.skip=true -Denforcer.skip=true
46+
RETURN_CODE=$?
4347
bash ${KOKORO_GFILE_DIR}/codecov.sh
44-
bash .kokoro/coerce_logs.sh
4548
;;
4649
lint)
4750
mvn \
4851
-Penable-samples \
4952
com.coveo:fmt-maven-plugin:check
53+
RETURN_CODE=$?
5054
;;
5155
javadoc)
5256
mvn javadoc:javadoc javadoc:test-javadoc
57+
RETURN_CODE=$?
5358
;;
5459
integration)
5560
mvn -B ${INTEGRATION_TEST_ARGS} \
@@ -59,7 +64,7 @@ integration)
5964
-Denforcer.skip=true \
6065
-fae \
6166
verify
62-
bash .kokoro/coerce_logs.sh
67+
RETURN_CODE=$?
6368
;;
6469
samples)
6570
if [[ -f samples/pom.xml ]]
@@ -72,15 +77,28 @@ samples)
7277
-Denforcer.skip=true \
7378
-fae \
7479
verify
75-
bash .kokoro/coerce_logs.sh
80+
RETURN_CODE=$?
7681
popd
7782
else
7883
echo "no sample pom.xml found - skipping sample tests"
7984
fi
8085
;;
8186
clirr)
8287
mvn -B -Denforcer.skip=true clirr:check
88+
RETURN_CODE=$?
8389
;;
8490
*)
8591
;;
8692
esac
93+
94+
# fix output location of logs
95+
bash .kokoro/coerce_logs.sh
96+
97+
if [[ "${ENABLE_BUILD_COP}" == "true" ]]
98+
then
99+
chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/buildcop
100+
${KOKORO_GFILE_DIR}/linux_amd64/buildcop -repo=googleapis/java-spanner-jdbc
101+
fi
102+
103+
echo "exiting with ${RETURN_CODE}"
104+
exit ${RETURN_CODE}

synth.metadata

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"updateTime": "2020-02-21T23:11:00.093008Z",
2+
"updateTime": "2020-02-22T10:16:10.861561Z",
33
"sources": [
44
{
55
"git": {
66
"name": ".",
77
"remote": "https://github.com/googleapis/java-spanner-jdbc.git",
8-
"sha": "8739015f62289adb92fd55b19a5bff8762da20a9"
8+
"sha": "e6ec261803cbdfd2f82aa8d524de1cbed2fae44e"
99
}
1010
},
1111
{

0 commit comments

Comments
 (0)