diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/infra/bifrost-upload-logs.sh | 29 | ||||
| -rw-r--r-- | jjb/infra/bifrost-verify-jobs.yml | 34 |
2 files changed, 58 insertions, 5 deletions
diff --git a/jjb/infra/bifrost-upload-logs.sh b/jjb/infra/bifrost-upload-logs.sh new file mode 100755 index 000000000..e2b8126e4 --- /dev/null +++ b/jjb/infra/bifrost-upload-logs.sh @@ -0,0 +1,29 @@ +#!/bin/bash +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2016 SUSE. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +set -eu +set -o pipefail + +BIFROST_CONSOLE_LOG="${BUILD_URL}/consoleText" +BIFROST_GS_URL=${BIFROST_GS_STORAGE/http:/gs:} + +echo "Uploading build logs to ${BIFROST_LOG_URL}" + +echo "Uploading console output" +curl -L ${BIFROST_CONSOLE_LOG} | gsutil cp - ${BIFROST_GS_URL}/console.txt + +[[ ! -d ${WORKSPACE}/logs ]] && exit 0 + +pushd ${WORKSPACE}/logs/ &> /dev/null +for x in *.log; do + echo "Compressing and uploading $x" + tar -czf - $x | gsutil cp - ${BIFROST_GS_URL}/$x.tar.gz +done +popd ${WORKSPACE}/logs &> /dev/null diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml index 422a42274..cbe21e256 100644 --- a/jjb/infra/bifrost-verify-jobs.yml +++ b/jjb/infra/bifrost-verify-jobs.yml @@ -120,6 +120,9 @@ - label: name: SLAVE_LABEL default: 'infra-{type}-{distro}' + - string: + name: BIFROST_LOG_URL + default: 'http://artifacts.opnfv.org/cross-community-ci/openstack/bifrost/$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER/$JOB_NAME' scm: - git: @@ -137,10 +140,9 @@ branch: '{branch}' builders: - - description-setter: - description: "Built on $NODE_NAME" - - shell: - !include-raw-escape: ./bifrost-verify.sh + - bifrost-set-name + - bifrost-build + - bifrost-artifacts-upload publishers: - email: @@ -161,7 +163,7 @@ exclude-no-code-change: 'false' - comment-added-contains-event: comment-contains-value: 'recheck' - custom-url: '* $JOB_NAME $BUILD_URL' + custom-url: '* $JOB_NAME $BIFROST_LOG_URL' silent-start: true projects: - project-compare-type: 'PLAIN' @@ -190,6 +192,7 @@ comment-contains-value: 'recheck' - comment-added-contains-event: comment-contains-value: 'reverify' + custom-url: '* $JOB_NAME $BIFROST_LOG_URL' projects: - project-compare-type: 'ANT' project-pattern: 'releng' @@ -202,3 +205,24 @@ - compare-type: ANT pattern: 'jjb/infra/**' readable-message: true + +#--------------------------- +# builder macros +#--------------------------- +- builder: + name: bifrost-set-name + builders: + - description-setter: + description: "Built on $NODE_NAME" + +- builder: + name: bifrost-build + builders: + - shell: + !include-raw: ./bifrost-verify.sh + +- builder: + name: bifrost-artifacts-upload + builders: + - shell: + !include-raw: ./bifrost-upload-logs.sh |