summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-01-24 22:43:32 +0000
committerMarkos Chandras <mchandras@suse.de>2017-01-24 22:43:32 +0000
commitf1f451c72f9d35883c9e21144f55fc464b1fcb8e (patch)
treeb63bf90c1ac9b05e2d4f411631fd5caef97c49f4
parentc2eac4583d767f7052bfad996b35105edd49ee46 (diff)
jjb: infra: bifrost-verify.sh: Always create the landing page
Previously, the function would have returned if no bifrost logs were present. However, this prevented the landing page from being generated and uploaded since that happens at the very end of that function. We rewored the code to always create a landing page even if there are no bifrost logs to upload. Change-Id: Ice557d0a42324a135d7f0e5ec94ec22811cc0ae7 Signed-off-by: Markos Chandras <mchandras@suse.de>
-rwxr-xr-xjjb/infra/bifrost-verify.sh35
1 files changed, 19 insertions, 16 deletions
diff --git a/jjb/infra/bifrost-verify.sh b/jjb/infra/bifrost-verify.sh
index 48f916e72..a7ef9c43f 100755
--- a/jjb/infra/bifrost-verify.sh
+++ b/jjb/infra/bifrost-verify.sh
@@ -24,16 +24,17 @@ function upload_logs() {
gsutil -q cp -Z ${WORKSPACE}/build_log.txt ${BIFROST_GS_URL}/build_log.txt
rm ${WORKSPACE}/build_log.txt
- [[ ! -d ${WORKSPACE}/logs ]] && return 0
-
- pushd ${WORKSPACE}/logs/ &> /dev/null
- for x in *.log; do
- echo "Compressing and uploading $x"
- gsutil -q cp -Z ${x} ${BIFROST_GS_URL}/${x}
- done
+ if [[ -d ${WORKSPACE}/logs ]]; then
+ pushd ${WORKSPACE}/logs &> /dev/null
+ for x in *.log; do
+ echo "Compressing and uploading $x"
+ gsutil -q cp -Z ${x} ${BIFROST_GS_URL}/${x}
+ done
+ popd &> /dev/null
+ fi
echo "Generating the landing page"
- cat > index.html <<EOF
+ 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>
<h2>Job: $JOB_NAME</h2>
@@ -41,20 +42,22 @@ function upload_logs() {
<li><a href=${BIFROST_LOG_URL}/build_log.txt>build_log.txt</a></li>
EOF
- for x in *.log; do
- echo "<li><a href=${BIFROST_LOG_URL}/${x}>${x}</a></li>" >> index.html
- done
+ if [[ -d ${WORKSPACE}/logs ]]; then
+ pushd ${WORKSPACE}/logs &> /dev/null
+ for x in *.log; do
+ echo "<li><a href=${BIFROST_LOG_URL}/${x}>${x}</a></li>" >> ${WORKSPACE}/index.html
+ done
+ popd &> /dev/null
+ fi
- cat >> index.html << EOF
+ cat >> ${WORKSPACE}/index.html << EOF
</ul>
</html>
EOF
- gsutil -q cp index.html ${BIFROST_GS_URL}/index.html
-
- rm index.html
+ gsutil -q cp ${WORKSPACE}/index.html ${BIFROST_GS_URL}/index.html
- popd &> /dev/null
+ rm ${WORKSPACE}/index.html
}
function fix_ownership() {