Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance ignore missing with compressed #101

Merged
merged 2 commits into from
Jul 26, 2024
Merged

Enhance ignore missing with compressed #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdfd854
Better handling of ignore missing option
toote Jul 24, 2024
6a4d64e
Updated tests due to removed message
toote Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 36 additions & 28 deletions hooks/pre-command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,17 @@ bk_agent() {
options+=("${@}") # all the rest

echo "~~~ Downloading artifacts ${EXTRA_MESSAGE}"
if ! buildkite-agent artifact "${options[@]}"; then
if [[ "${BUILDKITE_PLUGIN_ARTIFACTS_IGNORE_MISSING:-"false"}" != "false" ]]; then
echo "Ignoring error in download of" "${@: -2}"
else
echo "Error in download of" "${@: -2}"
return 1
fi
fi
buildkite-agent artifact "${options[@]}"
}

return 0
handle_bk_error() {
local filename="$1"
if [[ "${BUILDKITE_PLUGIN_ARTIFACTS_IGNORE_MISSING:-"false"}" != "false" ]]; then
echo "Ignoring error in download of ${filename}"
else
echo "Error in download of ${filename}"
exit 1
fi
}

handle_relocation() {
Expand Down Expand Up @@ -114,34 +115,38 @@ fi
workdir="${BUILDKITE_PLUGIN_ARTIFACTS_WORKDIR:-.}"

if [[ "${COMPRESSED}" == "true" ]]; then
bk_agent "${step_option}" "${build_option}" "${BUILDKITE_PLUGIN_ARTIFACTS_COMPRESSED}" "${workdir}"
if ! bk_agent "${step_option}" "${build_option}" "${BUILDKITE_PLUGIN_ARTIFACTS_COMPRESSED}" "${workdir}"; then
handle_bk_error "${BUILDKITE_PLUGIN_ARTIFACTS_COMPRESSED}"
else
echo "~~~ Uncompressing ${paths[*]} from ${BUILDKITE_PLUGIN_ARTIFACTS_COMPRESSED}"
"${compress[@]}" "${paths[@]}"

echo "~~~ Uncompressing ${paths[*]} from ${BUILDKITE_PLUGIN_ARTIFACTS_COMPRESSED}"
"${compress[@]}" "${paths[@]}"
# single relocation
if [[ -n "${BUILDKITE_PLUGIN_ARTIFACTS_DOWNLOAD_TO:-}" ]]; then
handle_relocation ""
fi

# single relocation
if [[ -n "${BUILDKITE_PLUGIN_ARTIFACTS_DOWNLOAD_TO:-}" ]]; then
handle_relocation ""
# multiple relocations
index=0
for path in "${paths[@]}"; do
handle_relocation "${index}"
((index+=1))
done
fi

# multiple relocations
index=0
for path in "${paths[@]}"; do
handle_relocation "${index}"
((index+=1))
done

elif [[ "${SINGULAR_DOWNLOAD_OBJECT}" == "true" ]]; then
if [[ "${RELOCATION}" == "true" ]]; then
source="${BUILDKITE_PLUGIN_ARTIFACTS_DOWNLOAD_FROM}"
else
source="${paths[*]}"
fi

bk_agent "${step_option}" "${build_option}" "${source}" "${workdir}"

if [[ -n "${BUILDKITE_PLUGIN_ARTIFACTS_DOWNLOAD_TO:-}" ]]; then
handle_relocation ""
if ! bk_agent "${step_option}" "${build_option}" "${source}" "${workdir}"; then
handle_bk_error "${source}"
else
if [[ -n "${BUILDKITE_PLUGIN_ARTIFACTS_DOWNLOAD_TO:-}" ]]; then
handle_relocation ""
fi
fi
elif [[ "${MULTIPLE_DOWNLOADS}" == "true" ]]; then
index=0
Expand All @@ -159,9 +164,12 @@ elif [[ "${MULTIPLE_DOWNLOADS}" == "true" ]]; then
source="${path}"
fi

bk_agent "${!step_env_var:-${step_option}}" "${!build_env_var:-${build_option}}" "${source}" "${workdir}"
if ! bk_agent "${!step_env_var:-${step_option}}" "${!build_env_var:-${build_option}}" "${source}" "${workdir}"; then
handle_bk_error "${source}"
else
handle_relocation "${index}"
fi

handle_relocation "${index}"
((index+=1))
done
fi
6 changes: 1 addition & 5 deletions tests/download-ignore-missing.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ setup() {
assert_success
assert_output --partial "Downloading artifacts"
assert_output --partial "Ignoring error in download of /tmp/foo.log"
assert_output --partial "Ignoring missing file /tmp/foo.log for relocation"

unstub buildkite-agent
}
Expand Down Expand Up @@ -102,7 +101,6 @@ setup() {
assert_success
assert_output --partial "Downloading artifacts"
assert_output --partial "Ignoring error in download of /tmp/foo.log"
assert_output --partial "Ignoring missing file /tmp/foo.log for relocation"
refute_output --partial "download artifact /tmp/foo.log"

assert [ ! -e /tmp/foo2.log ]
Expand All @@ -111,7 +109,6 @@ setup() {
unstub buildkite-agent
}


@test "Pre-command downloads multiple > 10 artifacts with build and relocation and some failures" {
stub_calls=()
for i in $(seq 0 10); do
Expand Down Expand Up @@ -139,10 +136,9 @@ setup() {
assert [ ! -e /tmp/foo-r-"${i}".log ]
assert [ ! -e /tmp/foo-"${i}".log ]
assert_output --partial "Ignoring error in download of /tmp/foo-${i}.log"
assert_output --partial "Ignoring missing file /tmp/foo-${i}.log"
refute_output --partial "downloaded artifact /tmp/foo-${i}.log"
fi
done

unstub buildkite-agent
}
}