From d7616c04e4eb6fe7fa13e5e3e17eb29dda91090e Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Wed, 6 Aug 2025 10:50:19 +0800 Subject: [PATCH] Add 0001-bootc-inistall-provision.patch for TF 2025-06.1 change https://docs.testing-farm.io/Testing%20Farm/0.1/releases/2025-06.1.html#_breaking_changes Resolves: #RHEL-104334 Signed-off-by: Xiaofeng Wang --- 0001-bootc-inistall-provision.patch | 14 ++++++++++++++ bootc.spec | 1 + 2 files changed, 15 insertions(+) create mode 100644 0001-bootc-inistall-provision.patch diff --git a/0001-bootc-inistall-provision.patch b/0001-bootc-inistall-provision.patch new file mode 100644 index 0000000..feb661a --- /dev/null +++ b/0001-bootc-inistall-provision.patch @@ -0,0 +1,14 @@ +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" diff --git a/bootc.spec b/bootc.spec index ad2d663..1252eab 100644 --- a/bootc.spec +++ b/bootc.spec @@ -32,6 +32,7 @@ Source1: %{url}/releases/download/v%{version}/bootc-%{version}-vendor.tar # 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}