public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: John Eckersberg <jeckersb@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/bootc] rawhide: Use upstream os-image-map.json
Date: Thu, 27 Aug 2026 22:02:33 GMT	[thread overview]
Message-ID: <178786815352.1.12422160121161256910.rpms-bootc-f5a8b66944a6@fedoraproject.org> (raw)

            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

                 reply	other threads:[~2026-08-27 22:02 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178786815352.1.12422160121161256910.rpms-bootc-f5a8b66944a6@fedoraproject.org \
    --to=jeckersb@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox