public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/bootc] rawhide: Use upstream os-image-map.json
@ 2026-08-27 22:02 John Eckersberg
  0 siblings, 0 replies; only message in thread
From: John Eckersberg @ 2026-08-27 22:02 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/bootc
            Branch : rawhide
            Commit : f5a8b66944a6dac89669dc4c1469b428032e1135
            Author : John Eckersberg <jeckersb@redhat.com>
            Date   : 2026-08-26T14:43:22-04:00
            Stats  : +0/-22 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/bootc/c/f5a8b66944a6dac89669dc4c1469b428032e1135?branch=rawhide

            Log:
            Use upstream os-image-map.json

No need to carry this extra copy downstream now!

---
diff --git a/os-image-map.json b/os-image-map.json
deleted file mode 100644
index e897623..0000000
--- a/os-image-map.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "base": {
-    "rhel-10.2": "images.paas.redhat.com/bootc/rhel-bootc:latest-10.2",
-    "rhel-9.8": "images.paas.redhat.com/bootc/rhel-bootc:latest-9.8",
-    "centos-9": "quay.io/centos-bootc/centos-bootc:stream9",
-    "centos-10": "quay.io/centos-bootc/centos-bootc:stream10",
-    "fedora-42": "quay.io/fedora/fedora-bootc:42",
-    "fedora-43": "quay.io/fedora/fedora-bootc:43",
-    "fedora-44": "quay.io/fedora/fedora-bootc:44",
-    "fedora-45": "quay.io/fedora/fedora-bootc:45"
-  },
-  "buildroot-base": {
-    "centos-9": "quay.io/centos/centos:stream9",
-    "centos-10": "quay.io/centos/centos:stream10",
-    "fedora-42": "quay.io/fedora/fedora:42",
-    "fedora-43": "quay.io/fedora/fedora:43",
-    "fedora-44": "quay.io/fedora/fedora:44",
-    "fedora-45": "quay.io/fedora/fedora:45"
-  }
-}

diff --git a/plans/all.fmf b/plans/all.fmf
index ebce5bd..983c236 100644
--- a/plans/all.fmf
+++ b/plans/all.fmf
@@ -22,8 +22,6 @@ prepare:
     script:
       - pwd && ls -al && ls -al /var/share/test-artifacts && mkdir -p bootc && cp /var/share/test-artifacts/*.src.rpm bootc
       - cd bootc && ls -al && rpm2cpio *.src.rpm | cpio -idmv && rm -f *-vendor.tar.zstd && zstd -d *.tar.zstd && tar -xvf *.tar -C . --strip-components=1 && ls -al
-      # Remove the "cp" line in next release, the fix already added in bootc upstream
-      - cp os-image-map.json bootc/hack
       - cd bootc/hack && ./provision-packit.sh
   # tmt-reboot and reboot do not work in this case
   # reboot in ansible is the only way to reboot in tmt prepare

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-27 22:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-27 22:02 [rpms/bootc] rawhide: Use upstream os-image-map.json John Eckersberg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox