Skip to content

test/system: add --command-timeout to skopeo copy calls #1815

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

Merged
debarshiray merged 2 commits into from
Jul 3, 2026
+14 −10
Merged

test/system: add --command-timeout to skopeo copy calls #1815

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6897fc9
test/system: Style fixes
Rolv-Apneseth Jun 25, 2026
4c92e63
test/system: Prevent skopeo(1) from hanging indefinitely
Rolv-Apneseth Jul 3, 2026
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
24 changes: 14 additions & 10 deletions test/system/libs/helpers.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,10 @@ function _pull_and_cache_distro_image() {
local -i ret_val

for ((j = 0; j < num_of_retries; j++)); do
error_message="$( (skopeo copy --dest-compress \
"docker://${image}" \
"dir:${IMAGE_CACHE_DIR}/${image_archive}" >/dev/null) 2>&1)"
error_message="$( (skopeo --command-timeout 10m copy \
--dest-compress \
"docker://${image}" \
"dir:${IMAGE_CACHE_DIR}/${image_archive}" >/dev/null) 2>&1)"
ret_val="$?"

if [ "$ret_val" -eq 0 ]; then
Expand Down Expand Up @@ -211,9 +212,10 @@ function _setup_docker_registry() {
assert_success

# Add fedora-toolbox:34 image to the registry
run skopeo copy --dest-authfile "${BATS_SUITE_TMPDIR}/authfile.json" \
dir:"${IMAGE_CACHE_DIR}"/fedora-toolbox-34 \
docker://"${DOCKER_REG_URI}"/fedora-toolbox:34
run skopeo --command-timeout 60s copy \
--dest-authfile "${BATS_SUITE_TMPDIR}/authfile.json" \
dir:"${IMAGE_CACHE_DIR}"/fedora-toolbox-34 \
docker://"${DOCKER_REG_URI}"/fedora-toolbox:34
assert_success

run rm "${BATS_SUITE_TMPDIR}/authfile.json"
Expand Down Expand Up @@ -331,7 +333,9 @@ function pull_distro_image() {
fi

# https://github.com/containers/skopeo/issues/547 for the options for containers-storage
run skopeo copy "dir:${IMAGE_CACHE_DIR}/${image_archive}" "containers-storage:[overlay@$TOOLBX_ROOTLESS_STORAGE_PATH+$TOOLBX_ROOTLESS_STORAGE_PATH]${image}"
run skopeo --command-timeout 60s copy \
"dir:${IMAGE_CACHE_DIR}/${image_archive}" \
"containers-storage:[overlay@$TOOLBX_ROOTLESS_STORAGE_PATH+$TOOLBX_ROOTLESS_STORAGE_PATH]${image}"

# shellcheck disable=SC2154
if [ "$status" -ne 0 ]; then
Expand Down Expand Up @@ -363,9 +367,9 @@ function pull_default_image_and_copy() {
image="${IMAGES[$distro]}:$version"

# https://github.com/containers/skopeo/issues/547 for the options for containers-storage
run skopeo copy \
"containers-storage:[overlay@$TOOLBX_ROOTLESS_STORAGE_PATH+$TOOLBX_ROOTLESS_STORAGE_PATH]$image" \
"containers-storage:[overlay@$TOOLBX_ROOTLESS_STORAGE_PATH+$TOOLBX_ROOTLESS_STORAGE_PATH]$image-copy"
run skopeo --command-timeout 60s copy \
"containers-storage:[overlay@$TOOLBX_ROOTLESS_STORAGE_PATH+$TOOLBX_ROOTLESS_STORAGE_PATH]$image" \
"containers-storage:[overlay@$TOOLBX_ROOTLESS_STORAGE_PATH+$TOOLBX_ROOTLESS_STORAGE_PATH]$image-copy"

if [ "$status" -ne 0 ]; then
echo "Failed to copy image $image to $image-copy"
Expand Down
Loading