Chore: Upgrade Jenkins-job-builder to 6.3.0

[releng/global-jjb.git] / shell / logs-deploy.sh

diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index 2009c32..d797fa7 100644 (file)
--- 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")
@@ -53,6 +62,5 @@ else
     lftools deploy s3 ${pattern_opts:-} "$S3_BUCKET" "$s3_path" \
         "$BUILD_URL" "$WORKSPACE"
 
-    echo "S3 build logs: <a href=\"https://$CDN_URL/$s3_path\"></a>"
+    echo "S3 build logs: <a href=\"https://$CDN_URL/$s3_path\">https://$CDN_URL/$s3_path</a>"
 fi
-