.bootc.metadata

@@ -1,2 +0,0 @@
-9ca5bceee40bd840b691c0a8024b2b6a916c36e7 SOURCES/bootc-1.8.0-vendor.tar.zstd
-b97adc7d411b192030dddea89366e2d6ebc5c7c2 SOURCES/bootc-1.8.0.tar.zstd

.fmf/version

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

.gitignore

@@ -1,2 +1,38 @@
-SOURCES/bootc-1.8.0-vendor.tar.zstd
-SOURCES/bootc-1.8.0.tar.zstd
+/bootc-0.1.2.tar.zst
+/bootc-0.1.2-vendor.tar.zst
+/bootc-0.1.3-vendor.tar.zstd
+/bootc-0.1.3.tar.zst
+/bootc-0.1.4-vendor.tar.zstd
+/bootc-0.1.4.tar.zstd
+/bootc-0.1.5-vendor.tar.zstd
+/bootc-0.1.5.tar.zstd
+/bootc-0.1.6-vendor.tar.zstd
+/bootc-0.1.6.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.3-vendor.tar.zstd
+/bootc-1.1.3.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

README.md

@@ -0,0 +1,3 @@
+# bootc
+
+The bootc package

SOURCES/0000-bootc-inistall-provision.patch

@@ -1,65 +0,0 @@
-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

SOURCES/0001-bootc-inistall-provision.patch

@@ -1,14 +0,0 @@
-diff --git i/tmt/tests/bootc-install-provision.sh w/tmt/tests/bootc-install-provision.sh
-index 6c9968c..c617d5e 100755
---- i/tmt/tests/bootc-install-provision.sh
-+++ w/tmt/tests/bootc-install-provision.sh
-@@ -50,7 +50,8 @@ if [ "$TMT_REBOOT_COUNT" -eq 0 ]; then
-     fi
- 
-     # Some rhts-*, rstrnt-* and tmt-* commands are in /usr/local/bin
--    cp -r /usr/local/bin "$BOOTC_TEMPDIR"
-+    cp -r /var/lib/tmt/scripts "$BOOTC_TEMPDIR/bin"
-+    ls -al "$BOOTC_TEMPDIR/bin"
- 
-     # Check image building folder content
-     ls -al "$BOOTC_TEMPDIR"

bootc.spec

@@ -1,5 +1,5 @@
 %bcond_without check
-%if 0%{?rhel} >= 9 || 0%{?fedora} > 41
+%if 0%{?rhel} >= 10 || 0%{?fedora} > 41
     %bcond_without ostree_ext
 %else
     %bcond_with ostree_ext
@@ -12,8 +12,8 @@
 %endif
 
 Name:           bootc
-Version:        1.8.0
-Release:        2%{?dist}
+Version:        1.4.0
+Release:        %{autorelease}
 Summary:        Bootable container system
 
 # Apache-2.0
@@ -29,11 +29,6 @@ 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
-Patch1: 0001-bootc-inistall-provision.patch
-
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
 
@@ -153,109 +148,4 @@ chmod +x %{?buildroot}/%{system_reinstall_bootc_install_podman_path}
 %{system_reinstall_bootc_install_podman_path}
 
 %changelog
-* 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
-
-* Fri Jul 11 2025 Gursewak Mangat <gurssing@redhat.com> - 1.4.0-1
-- Update to 1.4.0
-- Resolves: #RHEL-103125
-
-* Fri May 30 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.3.0-1
-- Update to 1.3.0
-- Resolves: #RHEL-94597
-
-* Tue Apr 15 2025 John Eckersberg <jeckersb@redhat.com> - 1.1.7-1
-- Update to 1.1.7
-- Resolves: #RHEL-87207
-
-* Thu Mar 06 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.1.6-3
-- Backport https://github.com/containers/bootc/pull/1167
-- Resolves: #RHEL-82293
-
-* Wed Feb 19 2025 John Eckersberg <jeckersb@redhat.com> - 1.1.5-2
-- Sync specfile from upstream
-- Resolves: #RHEL-80264
-- Resolves: #RHEL-81981
-
-* Mon Feb 10 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.1.5-1
-- Update to 1.1.5
-- Resolves: #RHEL-77733
-
-* Thu Jan 23 2025 John Eckersberg <jeckersb@redhat.com> - 1.1.4-2
-- Cherry pick patches for bootc-status-updated
-- Resolves: #RHEL-72862
-
-* Tue Jan 14 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.1.4-1
-- Update to 1.1.4
-  Resolves: #RHEL-72862
-
-* Thu Nov 07 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 1.1.2-1
-- Update to 1.1.2
-  Resolves: #RHEL-66258
-
-* Thu Oct 17 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 1.1.0-1
-- Update to 1.1.0
-  Resolves: #RHEL-63018
-
-* Fri Aug 16 2024 Colin Walters <walters@verbum.org> - 0.1.15-1
-- Update to 0.1.15
-  Resolves: #RHEL-50625
-
-* Thu Jul 25 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 0.1.14-1
-- Update to 0.1.14
-  Resolves: #RHEL-50625, #RHEL-45325, #RHEL-36003
-
-* Fri Jun 28 2024 Colin Walters <walters@verbum.org> - 0.1.13-2
-- Update to 0.1.13
-
-* Tue Jun 25 2024 Colin Walters <walters@verbum.org> - 0.1.12-3
-- Update to 0.1.12
-
-* Wed May 15 2024 Colin Walters <walters@verbum.org> - 0.1.11-2
-- Update to 0.1.11
-
-* Fri Apr 26 2024 Colin Walters <walters@verbum.org> - 0.1.10-2
-- Release 0.1.10
-
-* Mon Apr 08 2024 Colin Walters <walters@verbum.org> - 0.1.9-4
-- Correct JIRA link
-  Resolves: #RHEL-30878
-
-* Thu Mar 28 2024 Colin Walters <walters@verbum.org> - 0.1.9-3
-- Backport rollback
-  Related: #RHEL-30466
-
-* Wed Mar 27 2024 Colin Walters <walters@verbum.org> - 0.1.9-2
-- https://github.com/containers/bootc/releases/tag/v0.1.9
-  Resolves: #RHEL-30466
-
-* Tue Mar 19 2024 Colin Walters <walters@verbum.org> - 0.1.8-2
-- https://github.com/containers/bootc/releases/tag/v0.1.8
-
-* Wed Feb 14 2024 Colin Walters <walters@verbum.org> - 0.1.7-4
-- https://github.com/containers/bootc/releases/tag/v0.1.7
-
-* Tue Jan 23 2024 Colin Walters <walters@verbum.org> - 0.1.6-2
-- https://github.com/containers/bootc/releases/tag/v0.1.6
-
-* Fri Jan 12 2024 Joseph Marrero <jmarrero@redhat.com> - 0.1.5-1
-- Update to https://github.com/containers/bootc/releases/tag/v0.1.5
-
-* Thu Jan 11 2024 Colin Walters <walters@verbum.org> - 0.1.4-3
-- Loosen composefs requirement until it makes it into c9s
-
-* Mon Dec 11 2023 Colin Walters <walters@verbum.org> - 0.1.4-2
-- Initial import from fedora
-
+%autochangelog

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,43 @@
+discover:
+  how: fmf
+  dist-git-source: true
+  dist-git-install-builddeps: true
+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.4.0.tar.zstd) = fe31cbdd08560bad3e333cee73b56eff2c2ea81a846932cbaa2f607d95d2f3b5104ece9232d64290672909aa6aac8754c0e61a993e91db42e7b128635da62c9a
+SHA512 (bootc-1.4.0-vendor.tar.zstd) = cf462ef87fcc16bdd9d32d5b561504ab7ff233e0a9a3b683b50d47494ef19c78948870e274f6571092ce770d9e8c7c470100e9a4dc961645e67790a868ba1d5c