Display test.log when PolyGerrit tests are failing
Change-Id: Ib85ff771be116778b4cdb0ece26337e92ad18c6a
diff --git a/jenkins/gerrit-bazel-cat-test-log.sh b/jenkins/gerrit-bazel-cat-test-log.sh
new file mode 100755
index 0000000..95a6c09
--- /dev/null
+++ b/jenkins/gerrit-bazel-cat-test-log.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+if [ -f ~/polygerrit-failed ]
+then
+ echo ""
+ echo "*** POLYGERRIT TEST FAILED ***"
+ echo "See test log below"
+ echo "=============================="
+ echo ""
+ cat $(ls ~/.cache/bazel/_bazel_jenkins/*/execroot/gerrit/bazel-out/local-fastbuild/testlogs/polygerrit-ui/app/wct_test/test.log)
+ exit -1
+fi
+
diff --git a/jenkins/gerrit-bazel-test.sh b/jenkins/gerrit-bazel-test.sh
old mode 100644
new mode 100755
index ef306ac..377cb2a
--- a/jenkins/gerrit-bazel-test.sh
+++ b/jenkins/gerrit-bazel-test.sh
@@ -24,7 +24,7 @@
echo 'Test PolyGerrit locally'
echo '----------------------------------------------'
-bash ./polygerrit-ui/app/run_test.sh
+bash ./polygerrit-ui/app/run_test.sh || touch ~/polygerrit-failed
if [ -z "$SAUCE_USERNAME" ] || [ -z "$SAUCE_ACCESS_KEY" ]
then
@@ -32,7 +32,7 @@
else
echo 'Test PolyGerrit on Sauce Labs'
echo '----------------------------------------------'
- WCT_ARGS='--plugin sauce' bash ./polygerrit-ui/app/run_test.sh
+ WCT_ARGS='--plugin sauce' bash ./polygerrit-ui/app/run_test.sh || touch ~/polygerrit-failed
fi
exit 0
diff --git a/jenkins/gerrit-bazel-verifier-test.sh b/jenkins/gerrit-bazel-verifier-test.sh
old mode 100644
new mode 100755
index cac3db1..cd50525
--- a/jenkins/gerrit-bazel-verifier-test.sh
+++ b/jenkins/gerrit-bazel-verifier-test.sh
@@ -39,13 +39,13 @@
echo 'Not running local tests because env var "DISPLAY" is not set.'
else
echo 'Running local tests...'
- bash ./polygerrit-ui/app/run_test.sh
+ bash ./polygerrit-ui/app/run_test.sh || touch ~/polygerrit-failed
fi
if [ -z "$SAUCE_USERNAME" ] || [ -z "$SAUCE_ACCESS_KEY" ]
then
echo 'Not running on Sauce Labs because env vars are not set.'
else
echo 'Running tests on Sauce Labs...'
- WCT_ARGS='--plugin sauce' bash ./polygerrit-ui/app/run_test.sh
+ WCT_ARGS='--plugin sauce' bash ./polygerrit-ui/app/run_test.sh || touch ~/polygerrit-failed
fi
fi
diff --git a/jenkins/gerrit-buck-bazel-template.yaml b/jenkins/gerrit-buck-bazel-template.yaml
index c543514..89a16dd 100644
--- a/jenkins/gerrit-buck-bazel-template.yaml
+++ b/jenkins/gerrit-buck-bazel-template.yaml
@@ -127,6 +127,8 @@
!include-raw: gerrit-bazel-build.sh
- shell:
!include-raw: gerrit-bazel-test.sh
+ - shell:
+ !include-raw-escape: gerrit-bazel-cat-test-log.sh
publishers:
- archive:
artifacts: >
diff --git a/jenkins/gerrit-verifier.yaml b/jenkins/gerrit-verifier.yaml
index df15c21..955db41 100644
--- a/jenkins/gerrit-verifier.yaml
+++ b/jenkins/gerrit-verifier.yaml
@@ -137,6 +137,8 @@
!include-raw-escape: gerrit-bazel-build.sh
- shell:
!include-raw-escape: gerrit-bazel-verifier-test.sh
+ - shell:
+ !include-raw-escape: gerrit-bazel-cat-test-log.sh
publishers:
- archive:
