X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=shell%2Flogs-deploy.sh;h=2009c3276e96ba248c39926067b66dc5601d1ca4;hb=refs%2Fchanges%2F78%2F63678%2F3;hp=23660d7af5d88701f16e7b28bb9c283e86d8114a;hpb=7c671f9710451d603dfefe95dd332d594e9e4896;p=releng%2Fglobal-jjb.git
diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index 23660d7a..2009c327 100644
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -10,29 +10,49 @@
##############################################################################
echo "---> logs-deploy.sh"
-# Ensure we fail the job if any steps fail.
-set -eu -o pipefail
+# 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"
+function 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"
- # Handle multiple search extensions as separate values to '-p|--pattern'
- set -f # Disable pathname expansion
- search_exts=()
- IFS=' ' read -r -a search_exts <<< "${ARCHIVE_ARTIFACTS:-}"
- pattern_opts=()
- for search_ext in "${search_exts[@]:-}";
- do
- pattern_opts+=("-p" "$search_ext")
- done
+ echo "INFO: archiving workspace using pattern(s): ${pattern_opts:-}"
+ # shellcheck disable=SC2086
+ lftools deploy archives ${pattern_opts:-} "$nexus_url" "$nexus_path" "$WORKSPACE"
- lftools deploy archives "${pattern_opts[@]}" "$nexus_url" "$nexus_path" \
- "$WORKSPACE"
- set +f # Enable pathname expansion
+ 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: "
fi
+