X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=inline;f=shell%2Flogs-deploy.sh;h=bd4160808f56811b27926450ebe40e57b76f1e00;hb=ed6b5d3de1eadc54717670b2a7a946051c821944;hp=f80e0b437e809cd3ea474df51f87e2698d1199e4;hpb=8e91e5435df00bb187e29147625a9c3bb5d78307;p=releng%2Fglobal-jjb.git
diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index f80e0b43..bd416080 100644
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -10,29 +10,58 @@
##############################################################################
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
-if [[ -z $"${LOGS_SERVER:-}" ]]; then
- echo "WARNING: Logging server not set"
+# 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")
+ done
+ echo "${opts[@]-}"
+}
+
+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}"
+ 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"
- if [[ -n ${ARCHIVE_ARTIFACTS:-} ]] ; then
- # Handle multiple search extensions as separate values to '-p|--pattern'
- # "arg1 arg2" -> (-p arg1 -p arg2)
- pattern_opts=()
- for arg in $ARCHIVE_ARTIFACTS; do
- pattern_opts+=("-p" "$arg")
- done
- lftools deploy archives "${pattern_opts[@]}" \
- "$nexus_url" "$nexus_path" "$WORKSPACE"
- else
- lftools deploy archives "$nexus_url" "$nexus_path" "$WORKSPACE"
- fi
+ 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="logs/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER/"
+ echo "INFO: S3 path $s3_path"
+
+ echo "INFO: archiving logs to S3"
+ # shellcheck disable=SC2086
+ lftools deploy s3 ${pattern_opts:-} "$S3_BUCKET" "$s3_path" \
+ "$BUILD_URL" "$WORKSPACE"
+
+ echo "S3 build logs: https://$CDN_URL/$s3_path"
+fi
+