X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=inline;f=shell%2Flogs-deploy.sh;h=7522e81b7a8347762a0b50d8d8f4f76d7d72b8dc;hb=8d7fc58de91c6e013ad8dd474fa70d02a22a6e34;hp=5c0956d9be77b4b93d399df162ee32118614bb16;hpb=bada38f80d4db15240dc56ff69a738ba396066df;p=releng%2Fglobal-jjb.git
diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index 5c0956d9..7522e81b 100644
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -10,20 +10,30 @@
##############################################################################
echo "---> logs-deploy.sh"
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+lf-activate-venv lftools
+
# Ensure we fail the job if any steps fail
# Disable 'globbing'
set -euf -o pipefail
+# The 'lftool deploy archives' command below expects the archives
+# directory to exist. Normally lf-infra-sysstat or similar would
+# create it and add content, but to make sure this script is
+# self-contained, we ensure it exists here.
+mkdir -p "$WORKSPACE/archives"
+
function get_pattern_opts()
{
opts=()
for arg in ${ARCHIVE_ARTIFACTS:-}; do
- opts+=("-p" "$arg)")
+ opts+=("-p" "$arg")
done
echo "${opts[@]-}"
}
-pattern_opts="$(get_pattern_opts)"
+pattern_opts=$(get_pattern_opts)
if [[ -z ${LOGS_SERVER:-} ]]; then
echo "WARNING: Nexus logging server not set"
@@ -32,24 +42,27 @@ else
nexus_path="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
echo "INFO: Nexus URL $nexus_url path $nexus_path"
- echo "INFO: archiving workspace using pattern(s): $ARCHIVE_ARTIFACTS"
- lftools deploy archives ${pattern_opts:+"$pattern_opts"} "$nexus_url" "$nexus_path" "$WORKSPACE"
+ echo "INFO: archiving workspace using pattern(s): ${pattern_opts:-}"
+ # shellcheck disable=SC2086
+ lftools deploy archives ${pattern_opts:-} "$nexus_url" "$nexus_path" "$WORKSPACE"
- echo "INFO: archiving logs"
+ echo "INFO: archiving logs to Nexus"
lftools deploy logs "$nexus_url" "$nexus_path" "${BUILD_URL:-}"
- echo "Build logs: $LOGS_SERVER/$nexus_path"
+ echo "Nexus build logs: $LOGS_SERVER/$nexus_path"
fi
if [[ -z ${S3_BUCKET:-} ]]; then
echo "WARNING: S3 logging server not set"
else
- s3_path="$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER/"
+ s3_path="logs/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER/"
echo "INFO: S3 path $s3_path"
- lftools deploy s3 ${pattern_opts:+"$pattern_opts"} "$S3_BUCKET" "$s3_path" \
+ echo "INFO: archiving logs to S3"
+ # shellcheck disable=SC2086
+ lftools deploy s3 ${pattern_opts:-} "$S3_BUCKET" "$s3_path" \
"$BUILD_URL" "$WORKSPACE"
- echo "Build logs: "
+ echo "S3 build logs: "
fi