X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=shell%2Flogs-deploy.sh;h=2009c3276e96ba248c39926067b66dc5601d1ca4;hb=refs%2Fchanges%2F93%2F64493%2F2;hp=633aae86eeff5949a6ab6c1356b11a1c9a93eba5;hpb=327dae148d26f3eb1ed05c515916454279d87a77;p=releng%2Fglobal-jjb.git
diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index 633aae86..2009c327 100644
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -14,6 +14,17 @@ echo "---> logs-deploy.sh"
# Disable 'globbing'
set -euf -o pipefail
+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
@@ -21,39 +32,27 @@ else
nexus_path="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
echo "INFO: Nexus URL $nexus_url path $nexus_path"
- 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
- echo "INFO: archiving workspace using pattern(s): $ARCHIVE_ARTIFACTS"
- lftools deploy archives "${pattern_opts[@]}" \
- "$nexus_url" "$nexus_path" "$WORKSPACE"
- else
- echo "INFO: archiving workspace"
- lftools deploy archives "$nexus_url" "$nexus_path" "$WORKSPACE"
- fi
- echo "INFO: archiving logs"
+ 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:-}"
- 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="$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER"
+ s3_path="logs/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER/"
echo "INFO: S3 path $s3_path"
- pattern_opts=()
- for arg in $ARCHIVE_ARTIFACTS; do
- pattern_opts+=("-p" "$arg")
- done
- lftools deploy s3 "${pattern_opts[@]}" "$S3_BUCKET" "$s3_path" \
+ echo "INFO: archiving logs to S3"
+ # shellcheck disable=SC2086
+ lftools deploy s3 ${pattern_opts:-} "$S3_BUCKET" "$s3_path" \
"$BUILD_URL" "$WORKSPACE"
- echo "Build logs: "
+ echo "S3 build logs: "
fi