summaryrefslogtreecommitdiffstats
path: root/jjb/infra
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-02-02 00:08:49 +0000
committerMarkos Chandras <mchandras@suse.de>2017-02-02 00:08:49 +0000
commitc82b738d1cdbb4685271fcb09d3cbf038854746a (patch)
tree86c931cbef3543a42514465379e2e6285b7c90de /jjb/infra
parentd406fb03948296cdd02c7b93ffb9433ceb39d872 (diff)
jjb: infra: bifrost-verify.sh: Always print the GS URL
Previously, the GS URL was only printed when the job succeeded and we were able to collect all bifrost logs. However, it's also helpful to be able to see the URL when a job fails so move it outside of the 'if' block. Moreover, improve the wording in other informative messages. Change-Id: I080d5c1ff49de5abe50cc1049bb38f6e42123587 Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'jjb/infra')
-rwxr-xr-xjjb/infra/bifrost-verify.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/jjb/infra/bifrost-verify.sh b/jjb/infra/bifrost-verify.sh
index 94c7dacfa..4115ffcc4 100755
--- a/jjb/infra/bifrost-verify.sh
+++ b/jjb/infra/bifrost-verify.sh
@@ -24,8 +24,9 @@ function upload_logs() {
# before we upload the new data.
gsutil -q rm ${BIFROST_GS_URL}/index.html || true
+ echo "Uploading collected bifrost build logs to ${BIFROST_LOG_URL}"
+
if [[ -d ${WORKSPACE}/logs ]]; then
- echo "Uploading collected bifrost logs to ${BIFROST_LOG_URL}"
pushd ${WORKSPACE}/logs &> /dev/null
for x in *.log; do
echo "Compressing and uploading $x"
@@ -34,7 +35,7 @@ function upload_logs() {
popd &> /dev/null
fi
- echo "Generating the landing page"
+ echo "Generating the ${BIFROST_LOG_URL}/index.html landing page"
cat > ${WORKSPACE}/index.html <<EOF
<html>
<h1>Build results for <a href=https://$GERRIT_NAME/#/c/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER>$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER</a></h1>
@@ -58,7 +59,7 @@ EOF
# Finally, download and upload the entire build log so we can retain
# as much build information as possible
- echo "Uploading console output"
+ echo "Uploading the final console output"
curl -s -L ${BIFROST_CONSOLE_LOG} > ${WORKSPACE}/build_log.txt
gsutil -q cp -Z ${WORKSPACE}/build_log.txt ${BIFROST_GS_URL}/build_log.txt
rm ${WORKSPACE}/build_log.txt