Skip to content

test/system: Silence SC2154 #1378

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 3 commits into from
Sep 25, 2023
Merged

test/system: Silence SC2154 #1378

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d43d22
test/system: Simplify checking if the image exists or not
debarshiray Sep 25, 2023
574dbc9
test/system: Specify explit return values
debarshiray Sep 25, 2023
4362c39
test/system: Silence SC2154
debarshiray Sep 25, 2023
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
9 changes: 6 additions & 3 deletions test/system/libs/helpers.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,17 +334,20 @@ function pull_distro_image() {
fi

# No need to copy if the image is already available in Podman
run "$PODMAN" image exists "${image}"
if [[ "$status" -eq 0 ]]; then
return
if "$PODMAN" image exists "${image}"; then
return 0
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@$ROOTLESS_PODMAN_STORE_DIR+$ROOTLESS_PODMAN_STORE_DIR]${image}"

# shellcheck disable=SC2154
if [ "$status" -ne 0 ]; then
echo "Failed to load image ${image} from cache ${IMAGE_CACHE_DIR}/${image_archive}"
assert_success
fi

return 0
}


Expand Down