From 6897fc9ef6bdf6a529276d9deb47dd3bfd757958 Mon Sep 17 00:00:00 2001 From: Rolv Apneseth Date: Thu, 25 Jun 2026 14:48:22 +0100 Subject: [PATCH 1/3] test/system: Style fixes Fallout from the following: * 61e2c970f821221f43ac7831849497236fbd5eb0 * d5daa7167e89cc98eafe22e94dde5bdcd58de013 * ecd1ced719742a6faea4d0cf41d68391f5644b4e * 7a5f3ba2e2a0f0b73721105233e787bdf9284f34 https://github.com/containers/toolbox/pull/1811 https://github.com/containers/toolbox/pull/1815 --- test/system/libs/helpers.bash | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/test/system/libs/helpers.bash b/test/system/libs/helpers.bash index 4b48c7009..cb7219e50 100644 --- a/test/system/libs/helpers.bash +++ b/test/system/libs/helpers.bash @@ -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 copy \ + --dest-compress \ + "docker://${image}" \ + "dir:${IMAGE_CACHE_DIR}/${image_archive}" >/dev/null) 2>&1)" ret_val="$?" if [ "$ret_val" -eq 0 ]; then @@ -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 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" @@ -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 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 @@ -364,8 +368,8 @@ function pull_default_image_and_copy() { # 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" + "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" From 2bd4af19e0a10e1c4dd06985d89f165adcae1d66 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Wed, 29 Apr 2026 15:30:16 +0000 Subject: [PATCH 2/3] Debug ci timed out, do not merge --- playbooks/system-test-commands-options.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/system-test-commands-options.yaml b/playbooks/system-test-commands-options.yaml index af23dcab7..71683b60d 100644 --- a/playbooks/system-test-commands-options.yaml +++ b/playbooks/system-test-commands-options.yaml @@ -20,7 +20,7 @@ - include_tasks: build.yaml - name: Run the commands-options system tests - command: bats --filter-tags commands-options ./test/system + command: bats --show-output-of-passing-tests --timing --trace --filter-tags commands-options ./test/system environment: TMPDIR: '/var/tmp' TOOLBX: '/usr/local/bin/toolbox' From b5630f9ec6b0118615a2d35617a2247f9f9321a4 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 11 Jun 2026 15:03:42 +0200 Subject: [PATCH 3/3] Debug ci timed out, do not merge --- playbooks/system-test-runtime-environment-arch-fedora.yaml | 2 +- playbooks/system-test-runtime-environment-ubuntu.yaml | 2 +- test/system/libs/helpers.bash | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/playbooks/system-test-runtime-environment-arch-fedora.yaml b/playbooks/system-test-runtime-environment-arch-fedora.yaml index 9f9b607a1..ffa48b87a 100644 --- a/playbooks/system-test-runtime-environment-arch-fedora.yaml +++ b/playbooks/system-test-runtime-environment-arch-fedora.yaml @@ -20,7 +20,7 @@ - include_tasks: build.yaml - name: Run the (arch-fedora,runtime-environment) system tests - command: bats --filter-tags arch-fedora,runtime-environment ./test/system + command: bats --show-output-of-passing-tests --timing --trace --filter-tags arch-fedora,runtime-environment ./test/system environment: TMPDIR: '/var/tmp' TOOLBX: '/usr/local/bin/toolbox' diff --git a/playbooks/system-test-runtime-environment-ubuntu.yaml b/playbooks/system-test-runtime-environment-ubuntu.yaml index bb3ae14bb..c76677b82 100644 --- a/playbooks/system-test-runtime-environment-ubuntu.yaml +++ b/playbooks/system-test-runtime-environment-ubuntu.yaml @@ -20,7 +20,7 @@ - include_tasks: build.yaml - name: Run the (runtime-environment,ubuntu) system tests - command: bats --filter-tags runtime-environment,ubuntu ./test/system + command: bats --show-output-of-passing-tests --timing --trace --filter-tags runtime-environment,ubuntu ./test/system environment: TMPDIR: '/var/tmp' TOOLBX: '/usr/local/bin/toolbox' diff --git a/test/system/libs/helpers.bash b/test/system/libs/helpers.bash index cb7219e50..714091ab2 100644 --- a/test/system/libs/helpers.bash +++ b/test/system/libs/helpers.bash @@ -213,6 +213,7 @@ function _setup_docker_registry() { # Add fedora-toolbox:34 image to the registry run skopeo copy \ + --debug \ --dest-authfile "${BATS_SUITE_TMPDIR}/authfile.json" \ dir:"${IMAGE_CACHE_DIR}"/fedora-toolbox-34 \ docker://"${DOCKER_REG_URI}"/fedora-toolbox:34