summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
769456c)
Fix script to remove outputting $ARCHIVE_ARTIFACTS. Outputting required
that $ARCHIVE_ARTIFACTS be set for every job. Instead it will output
${pattern_opts:-}.
Signed-off-by: Houa Yang <hyang@contractor.linuxfoundation.org>
Change-Id: I5f75a12745d1358b89dc7af18a35736514143072
--- /dev/null
+---
+fixes:
+ - |
+ Fix script to remove outputting $ARCHIVE_ARTIFACTS. Outputting required
+ that $ARCHIVE_ARTIFACTS be set for every job. Instead it will output
+ ${pattern_opts:-}, which if $ARCHIVE_ARTIFACTS is not
+ set, will be blank.
{
opts=()
for arg in ${ARCHIVE_ARTIFACTS:-}; do
{
opts=()
for arg in ${ARCHIVE_ARTIFACTS:-}; do
done
echo "${opts[@]-}"
}
done
echo "${opts[@]-}"
}
-pattern_opts="$(get_pattern_opts)"
+pattern_opts=$(get_pattern_opts)
if [[ -z ${LOGS_SERVER:-} ]]; then
echo "WARNING: Nexus logging server not set"
if [[ -z ${LOGS_SERVER:-} ]]; then
echo "WARNING: Nexus logging server not set"
nexus_path="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
echo "INFO: Nexus URL $nexus_url path $nexus_path"
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): $ARCHIVE_ARTIFACTS"
- lftools deploy archives ${pattern_opts:+"$pattern_opts"} "$nexus_url" "$nexus_path" "$WORKSPACE"
+ 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"
+ echo "INFO: archiving logs to Nexus"
lftools deploy logs "$nexus_url" "$nexus_path" "${BUILD_URL:-}"
lftools deploy logs "$nexus_url" "$nexus_path" "${BUILD_URL:-}"
- echo "Build logs: <a href=\"$LOGS_SERVER/$nexus_path\">$LOGS_SERVER/$nexus_path</a>"
+ echo "Nexus build logs: <a href=\"$LOGS_SERVER/$nexus_path\">$LOGS_SERVER/$nexus_path</a>"
fi
if [[ -z ${S3_BUCKET:-} ]]; then
fi
if [[ -z ${S3_BUCKET:-} ]]; then
s3_path="$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER/"
echo "INFO: S3 path $s3_path"
s3_path="$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER/"
echo "INFO: S3 path $s3_path"
- lftools deploy s3 ${pattern_opts:+"$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"
"$BUILD_URL" "$WORKSPACE"
- echo "Build logs: <a href=\"https://$CDN_URL/$s3_path\"></a>"
+ echo "S3 build logs: <a href=\"https://$CDN_URL/$s3_path\"></a>"