Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion playbooks/system-test-commands-options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion playbooks/system-test-runtime-environment-ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
23 changes: 14 additions & 9 deletions test/system/libs/helpers.bash
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 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,11 @@ 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 \
--debug \
--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 +334,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
Expand Down Expand Up @@ -364,8 +369,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"
Expand Down
Loading