.bootc.metadata

@@ -1,2 +0,0 @@
-41a56ab6bb51f99445735cf567ace0e9297fe8bc SOURCES/bootc-1.13.0-vendor.tar.zstd
-46a80d31f9b5e715e75a5ff7d09a5663d48b0ab0 SOURCES/bootc-1.13.0.tar.zstd

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,2 +1,44 @@
-SOURCES/bootc-1.13.0-vendor.tar.zstd
-SOURCES/bootc-1.13.0.tar.zstd
+/bootc-0.1.4.tar.zstd
+/bootc-0.1.4-vendor.tar.zstd
+/bootc-0.1.5.tar.zstd
+/bootc-0.1.5-vendor.tar.zstd
+/bootc-0.1.6-vendor.tar.zstd
+/bootc-0.1.6.tar.zstd
+/bootc-0.1.7-vendor.tar.zstd
+/bootc-0.1.7.tar.zstd
+/bootc-0.1.8.tar.zstd
+/bootc-0.1.8-vendor.tar.zstd
+/bootc-0.1.9.tar.zstd
+/bootc-0.1.9-vendor.tar.zstd
+/bootc-0.1.10-vendor.tar.zstd
+/bootc-0.1.10.tar.zstd
+/bootc-0.1.11.tar.zstd
+/bootc-0.1.11-vendor.tar.zstd
+/bootc-0.1.12.tar.zstd
+/bootc-0.1.12-vendor.tar.zstd
+/bootc-0.1.13.tar.zstd
+/bootc-0.1.13-vendor.tar.zstd
+/bootc-0.1.14-vendor.tar.zstd
+/bootc-0.1.14.tar.zstd
+/bootc-0.1.15.tar.zstd
+/bootc-0.1.15-vendor.tar.zstd
+/bootc-0.1.16.tar.zstd
+/bootc-0.1.16-vendor.tar.zstd
+/bootc-1.1.0.tar.zstd
+/bootc-1.1.0-vendor.tar.zstd
+/bootc-1.1.2.tar.zstd
+/bootc-1.1.2-vendor.tar.zstd
+/bootc-1.1.4.tar.zstd
+/bootc-1.1.4-vendor.tar.zstd
+/bootc-1.1.5.tar.zstd
+/bootc-1.1.5-vendor.tar.zstd
+/bootc-1.1.6-vendor.tar.zstd
+/bootc-1.1.6.tar.zstd
+/bootc-1.1.7.tar.zstd
+/bootc-1.1.7-vendor.tar.zstd
+/bootc-1.3.0.tar.zstd
+/bootc-1.3.0-vendor.tar.zstd
+/bootc-1.4.0.tar.zstd
+/bootc-1.4.0-vendor.tar.zstd
+/bootc-1.5.1.tar.zstd
+/bootc-1.5.1-vendor.tar.zstd

0000-bootc-inistall-provision.patch

@@ -0,0 +1,65 @@
+diff --git i/tmt/tests/bootc-install-provision.sh w/tmt/tests/bootc-install-provision.sh
+index c4c884b..29df30c 100755
+--- i/tmt/tests/bootc-install-provision.sh
++++ w/tmt/tests/bootc-install-provision.sh
+@@ -4,6 +4,8 @@ set -exuo pipefail
+ BOOTC_TEMPDIR=$(mktemp -d)
+ trap 'rm -rf -- "$BOOTC_TEMPDIR"' EXIT
+ 
++ARCH=$(uname -m)
++
+ # LBI only enabled for test-22-logically-bound-install
+ LBI="${LBI:-disabled}"
+ 
+@@ -16,6 +18,28 @@ case "$ID" in
+     "fedora")
+         TIER1_IMAGE_URL="${TIER1_IMAGE_URL:-quay.io/fedora/fedora-bootc:${VERSION_ID}}"
+         ;;
++    "rhel")
++        TIER1_IMAGE_URL="${TIER1_IMAGE_URL:-images.paas.redhat.com/bootc/rhel-bootc:latest-${VERSION_ID}}"
++
++        CURRENT_COMPOSE_ID=$(skopeo inspect --no-tags --retry-times=5 --tls-verify=false "docker://${TIER1_IMAGE_URL}" | jq -r '.Labels."redhat.compose-id"')
++
++        if [[ -n ${CURRENT_COMPOSE_ID} ]]; then
++            if [[ ${CURRENT_COMPOSE_ID} == *-updates-* ]]; then
++                BATCH_COMPOSE="updates/"
++            else
++                BATCH_COMPOSE=""
++            fi
++        else
++            BATCH_COMPOSE="updates/"
++            CURRENT_COMPOSE_ID=latest-RHEL-$VERSION_ID
++        fi
++
++        # use latest compose if specific compose is not accessible
++        RC=$(curl -skIw '%{http_code}' -o /dev/null "http://download.eng.bos.redhat.com/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/STATUS")
++        if [[ $RC != "200" ]]; then
++            CURRENT_COMPOSE_ID=latest-RHEL-${VERSION_ID%%}
++        fi
++        ;;
+ esac
+ 
+ if [ "$TMT_REBOOT_COUNT" -eq 0 ]; then
+@@ -93,6 +117,22 @@ COMMONEOF
+         tee "$FEDORA_CI_CONTAINERFILE" > /dev/null << FEDORACIEOF
+ FROM $TIER1_IMAGE_URL
+ 
++RUN <<REPORUN
++tee "/etc/yum.repos.d/rhel.repo" >/dev/null <<RHELREPOEOF
++[rhel-baseos]
++name=baseos
++baseurl=http://download.eng.bos.redhat.com/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/compose/BaseOS/${ARCH}/os/
++enabled=1
++gpgcheck=0
++
++[rhel-appstream]
++name=appstream
++baseurl=http://download.eng.bos.redhat.com/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/compose/AppStream/${ARCH}/os/
++enabled=1
++gpgcheck=0
++RHELREPOEOF
++REPORUN
++
+ RUN dnf -y upgrade /rpms/*.rpm
+ FEDORACIEOF
+         cat >"$CONTAINERFILE" <<REALEOF

bootc.spec

@@ -1,5 +1,4 @@
 %bcond_without check
-%bcond_with tests
 %if 0%{?rhel} >= 9 || 0%{?fedora} > 41
     %bcond_without ostree_ext
 %else
@@ -12,17 +11,8 @@
     %bcond_with rhsm
 %endif
 
-%global rust_minor %(rustc --version | cut -f2 -d" " | cut -f2 -d".")
-
-# https://github.com/bootc-dev/bootc/issues/1640
-%if 0%{?fedora} || 0%{?rhel} >= 10 || 0%{?rust_minor} >= 89
-    %global new_cargo_macros 1
-%else
-    %global new_cargo_macros 0
-%endif
-
 Name:           bootc
-Version:        1.13.0
+Version:        1.5.1
 Release:        1%{?dist}
 Summary:        Bootable container system
 
@@ -35,10 +25,14 @@ Summary:        Bootable container system
 # MIT OR Apache-2.0
 # Unlicense OR MIT
 License:        Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Unlicense OR MIT)
-URL:            https://github.com/bootc-dev/bootc
+URL:            https://github.com/containers/bootc
 Source0:        %{url}/releases/download/v%{version}/bootc-%{version}.tar.zstd
 Source1:        %{url}/releases/download/v%{version}/bootc-%{version}-vendor.tar.zstd
 
+# Don't remove, downstream patch only
+# Patch for integration test RHEL 9.x and 10.x support
+Patch0: 0000-bootc-inistall-provision.patch
+
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
 
@@ -46,7 +40,6 @@ BuildRequires: libzstd-devel
 BuildRequires: make
 BuildRequires: ostree-devel
 BuildRequires: openssl-devel
-BuildRequires: go-md2man
 %if 0%{?rhel}
 BuildRequires: rust-toolset
 %else
@@ -58,13 +51,10 @@ BuildRequires: skopeo ostree
 
 # Backing storage tooling https://github.com/containers/composefs/issues/125
 Requires: composefs
-# Keep this list in sync with workspace.metadata.binary-dependencies until we sync
-# it automatically
+# For OS updates
 Requires: ostree
 Requires: skopeo
 Requires: podman
-Requires: util-linux-core
-Requires: /usr/bin/chcon
 # For bootloader updates
 Recommends: bootupd
 
@@ -85,163 +75,83 @@ Recommends: podman
 %description -n system-reinstall-bootc
 This package provides a utility to simplify reinstalling the current system to a given bootc image.
 
-%if %{with tests}
-%package tests
-Summary: Integration tests for bootc
-Requires: %{name} = %{version}-%{release}
-
-%description tests
-This package contains the integration test suite for bootc.
-%endif
-
 %global system_reinstall_bootc_install_podman_path %{_prefix}/lib/system-reinstall-bootc/install-podman
 
-%if 0%{?container_build}
-# Source is already at /src, no subdirectory
-%global _buildsubdir .
-%endif
-
 %prep
-%if ! 0%{?container_build}
 %autosetup -p1 -a1
 # Default -v vendor config doesn't support non-crates.io deps (i.e. git)
 cp .cargo/vendor-config.toml .
 %cargo_prep -N
 cat vendor-config.toml >> .cargo/config.toml
 rm vendor-config.toml
-%else
-# Container build: source already at _builddir (/src), nothing to extract
-# RPM's %mkbuilddir creates a subdirectory; symlink it back to the source
-cd ..
-rm -rf %{name}-%{version}-build
-ln -s . %{name}-%{version}-build
-cd %{name}-%{version}-build
-%endif
 
 %build
+# Build the main bootc binary
+%if 0%{?fedora} || 0%{?rhel} >= 10
+    %cargo_build %{?with_rhsm:-f rhsm}
+%else
+    %cargo_build %{?with_rhsm:--features rhsm}
+%endif
+
+# Build the system reinstallation CLI binary
+%global cargo_args -p system-reinstall-bootc
 export SYSTEM_REINSTALL_BOOTC_INSTALL_PODMAN_PATH=%{system_reinstall_bootc_install_podman_path}
-# Build this first to avoid feature skew
-make manpages
-
-# Build all binaries
-%if 0%{?container_build}
-# Container build: use cargo directly with cached dependencies to avoid RPM macro overhead
-cargo build -j%{_smp_build_ncpus} --release %{?with_rhsm:--features rhsm} --bins
+%if 0%{?fedora} || 0%{?rhel} >= 10
+    # In cargo-rpm-macros, the cargo_build macro does flag processing,
+    # so we need to pass '--' to signify that cargo_args is not part
+    # of the macro args
+    %cargo_build -- %cargo_args
 %else
-# Non-container build: use RPM macros for proper dependency tracking
-%if %new_cargo_macros
-    %cargo_build %{?with_rhsm:-f rhsm} -- --bins
-%else
-    %cargo_build %{?with_rhsm:--features rhsm} -- --bins
-%endif
+    # Older macros from rust-toolset do *not* do flag processing, so
+    # '--' would be passed through to cargo directly, which is not
+    # what we want.
+    %cargo_build %cargo_args
 %endif
 
-%if ! 0%{?container_build}
 %cargo_vendor_manifest
 # https://pagure.io/fedora-rust/rust-packaging/issue/33
 sed -i -e '/https:\/\//d' cargo-vendor.txt
 %cargo_license_summary
 %{cargo_license} > LICENSE.dependencies
-%endif
 
 %install
-# Pass CARGO_FEATURES explicitly to prevent auto-detection rebuild in install environment
-%make_install INSTALL="install -p -c" CARGO_FEATURES="%{?with_rhsm:rhsm}"
+%make_install INSTALL="install -p -c"
 %if %{with ostree_ext}
 make install-ostree-hooks DESTDIR=%{?buildroot}
 %endif
-%if %{with tests}
-install -D -m 0755 target/release/tests-integration %{buildroot}%{_bindir}/bootc-integration-tests
-%endif
 mkdir -p %{buildroot}/%{dirname:%{system_reinstall_bootc_install_podman_path}}
 cat >%{?buildroot}/%{system_reinstall_bootc_install_podman_path} <<EOF
 #!/bin/bash
 exec dnf -y install podman
 EOF
 chmod +x %{?buildroot}/%{system_reinstall_bootc_install_podman_path}
-# generate doc file list excluding directories; workaround for
-# https://github.com/coreos/rpm-ostree/issues/5420
-touch %{?buildroot}/%{_docdir}/bootc/baseimage/base/sysroot/.keepdir
-find %{?buildroot}/%{_docdir} ! -type d -printf '%{_docdir}/%%P\n' | sort > bootcdoclist.txt
-
-rm -f %{buildroot}/%{_datadir}/elvish/lib/bootc.elv
-rm -f %{buildroot}/%{_datadir}/powershell/Modules/Bootc/Bootc.psm1
 
 %if %{with check}
 %check
-if grep -qEe 'Seccomp:.*0$' /proc/self/status; then
-    %cargo_test
-else
-    echo "skipping unit tests due to https://github.com/rpm-software-management/mock/pull/1613#issuecomment-3421908652"
-fi
+%cargo_test
 %endif
 
-%files -f bootcdoclist.txt
+%files
 %license LICENSE-MIT
 %license LICENSE-APACHE
-%if ! 0%{?container_build}
 %license LICENSE.dependencies
 %license cargo-vendor.txt
-%endif
 %doc README.md
 %{_bindir}/bootc
 %{_prefix}/lib/bootc/
 %{_prefix}/lib/systemd/system-generators/*
-%{_prefix}/lib/dracut/modules.d/51bootc/
 %if %{with ostree_ext}
 %{_prefix}/libexec/libostree/ext/*
 %endif
 %{_unitdir}/*
-%{_mandir}/man*/*bootc*
-%if 0%{?rhel} && 0%{?rhel} <= 9
-%{_datadir}/bash-completion/completions/bootc
-%{_datadir}/zsh/site-functions/_bootc
-%{_datadir}/fish/vendor_completions.d/bootc.fish
-%else
-%{bash_completions_dir}/bootc
-%{zsh_completions_dir}/_bootc
-%{fish_completions_dir}/bootc.fish
-%endif
+%{_docdir}/bootc/*
+%{_mandir}/man*/bootc*
 
 %files -n system-reinstall-bootc
 %{_bindir}/system-reinstall-bootc
 %{system_reinstall_bootc_install_podman_path}
 
-%if %{with tests}
-%files tests
-%{_bindir}/bootc-integration-tests
-%endif
-
 %changelog
-* Mon Feb 24 2026 Colin Walters <walters@verbum.org> - 1.13.0-1
-- Update to 1.13.0
-- https://github.com/bootc-dev/bootc/releases/tag/v1.13.0
-- Resolves: RHEL-151443
-
-* Fri Jan 17 2026 Colin Walters <walters@verbum.org> - 1.12.1-1
-- Update to 1.12.1
-- Fix mount point check regression breaking bootc-image-builder
-- Resolves: RHEL-142112
-
-* Thu Jan 09 2026 Colin Walters <walters@verbum.org> - 1.12.0-1
-- Update to 1.12.0
-- Resolves: RHEL-140335
-
-* Thu Oct 30 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.10.0-1
-- Update to 1.10.0
-- Resolves: #RHEL-125340
-
-* Fri Sep 05 2025 Colin Walters <walters@verbum.org> - 1.8.0-2
-- Update to 1.8.0
-
-* Tue Aug 26 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.7.1-1
-- Update to 1.7.1
-- Resolves: #RHEL-111339
-
-* Thu Aug 21 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.7.0-1
-- Update to 1.7.0
-- Resolves: #RHEL-109555
-
 * Fri Jul 22 2025 Gursewak Mangat <gurssing@redhat.com> - 1.5.1-1
 - Update to 1.5.1
 - Resolves: #RHEL-104335

gating.yaml

@@ -0,0 +1,17 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_contexts:
+  - bodhi_update_push_stable
+  - bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
+--- !Policy
+product_versions:
+  - rhel-9
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

plans/all.fmf

@@ -0,0 +1,49 @@
+discover:
+  how: fmf
+  dist-git-source: true
+  dist-git-install-builddeps: true
+prepare:
+  - how: install
+    package:
+      - podman
+      - skopeo
+      - jq
+execute:
+  how: tmt
+
+/test-01-readonly:
+  summary: Execute booted readonly/nondestructive tests
+  discover+:
+    test:
+      - /tmt/tests/bootc-install-provision
+      - test-01-readonly
+
+/test-20-local-upgrade:
+  summary: Execute local upgrade tests
+  discover+:
+    test:
+        - /tmt/tests/bootc-install-provision
+        - test-20-local-upgrade
+
+/test-21-logically-bound-switch:
+  summary: Execute logically bound images tests for switching images
+  discover+:
+    test:
+        - /tmt/tests/bootc-install-provision
+        - test-21-logically-bound-switch
+
+/test-22-logically-bound-install:
+  summary: Execute logically bound images tests for switching images
+  environment+:
+    LBI: enabled
+  discover+:
+    test:
+        - /tmt/tests/bootc-install-provision
+        - test-22-logically-bound-install
+
+/test-23-install-outside-container:
+  summary: Execute tests for installing outside of a container
+  discover+:
+    test:
+        - /tmt/tests/bootc-install-provision
+        - test-23-install-outside-container

sources

@@ -0,0 +1,2 @@
+SHA512 (bootc-1.5.1.tar.zstd) = 9dfa28ef1a36cfce8631c286bb5efb4cef3edab181ff88470a32fc881af5354e8e97585a18a032cbe9e6113ac252e44b48fa8453fb065f42e5141cc0ddb74344
+SHA512 (bootc-1.5.1-vendor.tar.zstd) = 34c56edbdb5f6479fee70cd8805f66aa26e2358dc546a4b99a31d4ed2632e3d1ef5d26e2b3f40fd50357a240cc42a634d2e351c23a9d942bbb4be28cd1993d96