X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=shell%2Flogs-deploy.sh;h=d797fa7e690fffd0177dc3bc92a505d940efd25f;hb=861a66c8f0b15813ed4330d02b302d1d1ce6a998;hp=114692e96d8d2c2d5abc521f13f5bd7b9a2d53f0;hpb=b3c4fefa00bb18fe2d8ae6f4ba3e2bf0abd154c5;p=releng%2Fglobal-jjb.git
diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index 114692e9..d797fa7e 100644
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -10,28 +10,57 @@
##############################################################################
echo "---> logs-deploy.sh"
-# Ensure we fail the job if any steps fail.
-set -eu -o pipefail
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+lf-activate-venv --python python3.8 lftools
-set -x # Trace commands for this script to make debugging easier.
+# Ensure we fail the job if any steps fail
+# Disable 'globbing'
+set -euf -o pipefail
-ARCHIVE_ARTIFACTS="${ARCHIVE_ARTIFACTS:-}"
-LOGS_SERVER="${LOGS_SERVER:-None}"
+# 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"
-if [ "${LOGS_SERVER}" == 'None' ]
-then
- set +x # Disable trace since we no longer need it
+get_pattern_opts () {
+ opts=()
+ for arg in ${ARCHIVE_ARTIFACTS:-}; do
+ opts+=("-p" "$arg")
+ done
+ echo "${opts[@]-}"
+}
- echo "WARNING: Logging server not set"
+pattern_opts=$(get_pattern_opts)
+
+if [[ -z ${LOGS_SERVER:-} ]]; then
+ echo "WARNING: Nexus logging server not set"
else
- NEXUS_URL="${NEXUSPROXY:-$NEXUS_URL}"
- NEXUS_PATH="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
- BUILD_URL="${BUILD_URL}"
+ nexus_url="${NEXUSPROXY:-$NEXUS_URL}"
+ 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): ${pattern_opts:-}"
+ # shellcheck disable=SC2086
+ lftools deploy archives ${pattern_opts:-} "$nexus_url" "$nexus_path" "$WORKSPACE"
+
+ echo "INFO: archiving logs to Nexus"
+ lftools deploy logs "$nexus_url" "$nexus_path" "${BUILD_URL:-}"
- lftools deploy archives -p "$ARCHIVE_ARTIFACTS" "$NEXUS_URL" "$NEXUS_PATH" "$WORKSPACE"
- lftools deploy logs "$NEXUS_URL" "$NEXUS_PATH" "$BUILD_URL"
+ echo "Nexus build logs: $LOGS_SERVER/$nexus_path"
+fi
+
+if [[ -z ${S3_BUCKET:-} ]]; then
+ echo "WARNING: S3 logging server not set"
+else
+ s3_path="logs/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER/"
+ echo "INFO: S3 path $s3_path"
- set +x # Disable trace since we no longer need it.
+ echo "INFO: archiving logs to S3"
+ # shellcheck disable=SC2086
+ lftools deploy s3 ${pattern_opts:-} "$S3_BUCKET" "$s3_path" \
+ "$BUILD_URL" "$WORKSPACE"
- echo "Build logs: $LOGS_SERVER/$NEXUS_PATH"
+ echo "S3 build logs: https://$CDN_URL/$s3_path"
fi