Skip to content

Commit e54d2c2

Browse files
committed
tests: Fix incorrect prune
Now that we're building a from-scratch image it won't have `/ostree` in it; this line was always pruning the wrong repo. Signed-off-by: Colin Walters <[email protected]>
1 parent 243362e commit e54d2c2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

crates/ostree-ext/ci/priv-integration.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ set -euo pipefail
88
mkdir -p /var/tmp
99

1010
sysroot=/run/host
11+
repo="${sysroot}/ostree/repo"
1112
# Current stable image fixture
1213
image=quay.io/fedora/fedora-coreos:testing-devel
1314
imgref=ostree-unverified-registry:${image}
@@ -112,11 +113,10 @@ systemd-run -dP --wait skopeo copy containers-storage:localhost/fcos-derived "${
112113
systemd-run -dP --wait skopeo copy "${derived_img}" "${derived_img_dir}"
113114

114115
# Prune to reset state
115-
ostree refs ostree/container/image --delete
116+
ostree --repo="${repo}" refs ostree/container/image --delete
116117

117-
repo="${sysroot}/ostree/repo"
118118
images=$(ostree container image list --repo "${repo}" | wc -l)
119-
test "${images}" -eq 1
119+
test "${images}" -eq 0
120120
ostree container image deploy --sysroot "${sysroot}" \
121121
--stateroot "${stateroot}" --imgref ostree-unverified-image:"${derived_img}"
122122
imgref=$(ostree refs --repo=${repo} ostree/container/image | head -1)

0 commit comments

Comments
 (0)