Skip to content
Merged
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
4 changes: 2 additions & 2 deletions tests/build-chunked-oci/Containerfile.builder
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Note that the GHA flow in ci.yml injects a binary from C9S.
FROM quay.io/centos-bootc/centos-bootc:stream9
# Note that the GHA flow in ci.yml injects a binary from C10S.
FROM quay.io/centos-bootc/centos-bootc:stream10
RUN <<EORUN
set -xeuo pipefail
# Pull in the binary we just built; if you're doing this locally you'll want
Expand Down
4 changes: 2 additions & 2 deletions tests/build-chunked-oci/test-buildah.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
set -euxo pipefail

cat > Containerfile <<EOF
FROM quay.io/centos-bootc/centos-bootc:stream9
FROM quay.io/centos-bootc/centos-bootc:stream10
RUN dnf install -y vim-enhanced
EOF

buildah pull quay.io/centos-bootc/centos-bootc:stream9
buildah pull quay.io/centos-bootc/centos-bootc:stream10
buildah build -t localhost/my-image .
/usr/bin/rpm-ostree experimental compose build-chunked-oci --bootc --from=localhost/my-image --output=containers-storage:localhost/my-image-chunked --format-version=2

Expand Down
2 changes: 1 addition & 1 deletion tests/build-chunked-oci/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ compare_image_contents() {
}

# First: a cross-arch rechunking
testimg_base=quay.io/centos-bootc/centos-bootc:stream9
testimg_base=quay.io/centos-bootc/centos-bootc:stream10
chunked_output=localhost/chunked-ppc64le
podman pull --arch=ppc64le ${testimg_base}
podman run --rm --privileged --security-opt=label=disable \
Expand Down
2 changes: 1 addition & 1 deletion tests/common/libvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ vm_run_container() {
# (use -n so this ssh invocation doesn't consume stdin)
vm_cmd -n mkdir -p /var/cache/dnf
vm_cmd podman run --rm -v /var/cache/dnf:/var/cache/dnf:z $podman_args \
quay.io/centos/centos:stream9 "$@"
quay.io/centos/centos:stream10 "$@"
}

# $1 - service name
Expand Down