X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Flogs-deploy.sh;h=d797fa7e690fffd0177dc3bc92a505d940efd25f;hb=04853ec1c27444d494afae28e8c181b711280f4b;hp=f1b5911e934aa9e79895787e8a71ab4ad59238fc;hpb=3b99cd4d3bec4dcd56297f28317af62f26c078bf;p=releng%2Fglobal-jjb.git
diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index f1b5911e..d797fa7e 100644
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -10,12 +10,21 @@
##############################################################################
echo "---> logs-deploy.sh"
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+lf-activate-venv --python python3.8 lftools
+
# Ensure we fail the job if any steps fail
# Disable 'globbing'
set -euf -o pipefail
-function get_pattern_opts()
-{
+# 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"
+
+get_pattern_opts () {
opts=()
for arg in ${ARCHIVE_ARTIFACTS:-}; do
opts+=("-p" "$arg")
@@ -45,7 +54,7 @@ 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"
echo "INFO: archiving logs to S3"
@@ -53,6 +62,5 @@ else
lftools deploy s3 ${pattern_opts:-} "$S3_BUCKET" "$s3_path" \
"$BUILD_URL" "$WORKSPACE"
- echo "S3 build logs: "
+ echo "S3 build logs: https://$CDN_URL/$s3_path"
fi
-