Merge pull request #5516 from jmarrero/ci-fix1

cgwalters · web-flow · commit e1047eb04906 · 2025-10-24T13:38:46.000-04:00
tests: Update remaining stream9 references to stream10
diff --git a/tests/build-chunked-oci/Containerfile.builder b/tests/build-chunked-oci/Containerfile.builder
@@ -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
diff --git a/tests/build-chunked-oci/test-buildah.sh b/tests/build-chunked-oci/test-buildah.sh
@@ -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
 
diff --git a/tests/build-chunked-oci/test.sh b/tests/build-chunked-oci/test.sh
@@ -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 \
diff --git a/tests/common/libvm.sh b/tests/common/libvm.sh
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ compare_image_contents() {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`# First: a cross-arch rechunking`
`52`		`-testimg_base=quay.io/centos-bootc/centos-bootc:stream9`
	`52`	`+testimg_base=quay.io/centos-bootc/centos-bootc:stream10`
`53`	`53`	`chunked_output=localhost/chunked-ppc64le`
`54`	`54`	`podman pull --arch=ppc64le ${testimg_base}`
`55`	`55`	`podman run --rm --privileged --security-opt=label=disable \`
Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,7 @@ vm_run_container() {`
`549`	`549`	`# (use -n so this ssh invocation doesn't consume stdin)`
`550`	`550`	`vm_cmd -n mkdir -p /var/cache/dnf`
`551`	`551`	`vm_cmd podman run --rm -v /var/cache/dnf:/var/cache/dnf:z $podman_args \`
`552`		`- quay.io/centos/centos:stream9 "$@"`
	`552`	`+ quay.io/centos/centos:stream10 "$@"`
`553`	`553`	`}`
`554`	`554`
`555`	`555`	`# $1 - service name`