From b0533698eaf776dc1f420ed122beae7c4fabe9cb Mon Sep 17 00:00:00 2001
From: CoreOS Bot <coreosbot@fedoraproject.org>
Date: Fri, 19 Apr 2024 15:47:41 +0000
Subject: [PATCH] tree: promote changes from testing at
 c8b83e2bd5945205fed47d6b3686e864250825e7

---
 kola-denylist.yaml                        | 15 ++++-
 manifest-lock.aarch64.json                | 66 +++++++++++-----------
 manifest-lock.ppc64le.json                | 68 +++++++++++------------
 manifest-lock.s390x.json                  | 66 +++++++++++-----------
 manifest-lock.x86_64.json                 | 66 +++++++++++-----------
 manifests/exclude-dnf.yaml                |  3 +
 manifests/fedora-coreos-base.yaml         |  5 +-
 manifests/fedora-coreos.yaml              |  8 ++-
 manifests/include-dnf.yaml                | 13 +++++
 manifests/system-configuration.yaml       |  3 +
 tests/kola/ignition/delete-config/test.sh |  4 ++
 11 files changed, 177 insertions(+), 140 deletions(-)
 create mode 100644 manifests/exclude-dnf.yaml
 create mode 100644 manifests/include-dnf.yaml

diff --git a/kola-denylist.yaml b/kola-denylist.yaml
index 30c89216b9..7cfa718d47 100644
--- a/kola-denylist.yaml
+++ b/kola-denylist.yaml
@@ -7,16 +7,27 @@
   tracker: https://github.com/coreos/coreos-assembler/pull/1478
 - pattern: coreos.ignition.ssh.key
   tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1553
-  # snooze: 2024-03-29 (disabled on promotion)
+  # snooze: 2024-04-15 (disabled on promotion)
   # warn: true (disabled on promotion)
   platforms:
     - azure
 - pattern: ext.config.var-mount.scsi-id
   tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1670
-  # snooze: 2024-04-01 (disabled on promotion)
+  # snooze: 2024-04-15 (disabled on promotion)
   # warn: true (disabled on promotion)
   streams:
     - rawhide
     - branched
     - next
     - next-devel
+- pattern: coreos.boot-mirror*
+  tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1659
+  # warn: true (disabled on promotion)
+  arches:
+    - ppc64le
+- pattern: ext.config.kdump.crash
+  tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1698
+  # snooze: 2024-04-07 (disabled on promotion)
+  # warn: true (disabled on promotion)
+  streams:
+    - rawhide
diff --git a/manifest-lock.aarch64.json b/manifest-lock.aarch64.json
index 07cbf1131a..4e3aeaa80b 100644
--- a/manifest-lock.aarch64.json
+++ b/manifest-lock.aarch64.json
@@ -187,7 +187,7 @@
       }
     },
     "btrfs-progs": {
-      "evra": "6.7.1-1.fc39.aarch64",
+      "evra": "6.8-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "btrfs-progs"
       }
@@ -247,25 +247,25 @@
       }
     },
     "clevis": {
-      "evra": "19-4.fc39.aarch64",
+      "evra": "20-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "clevis"
       }
     },
     "clevis-dracut": {
-      "evra": "19-4.fc39.aarch64",
+      "evra": "20-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "clevis"
       }
     },
     "clevis-luks": {
-      "evra": "19-4.fc39.aarch64",
+      "evra": "20-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "clevis"
       }
     },
     "clevis-systemd": {
-      "evra": "19-4.fc39.aarch64",
+      "evra": "20-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "clevis"
       }
@@ -607,7 +607,7 @@
       }
     },
     "expat": {
-      "evra": "2.6.0-1.fc39.aarch64",
+      "evra": "2.6.2-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "expat"
       }
@@ -721,7 +721,7 @@
       }
     },
     "fuse-sshfs": {
-      "evra": "3.7.3-4.fc39.aarch64",
+      "evra": "3.7.3-9.fc39.aarch64",
       "metadata": {
         "sourcerpm": "fuse-sshfs"
       }
@@ -739,7 +739,7 @@
       }
     },
     "fwupd": {
-      "evra": "1.9.15-1.fc39.aarch64",
+      "evra": "1.9.16-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "fwupd"
       }
@@ -793,25 +793,25 @@
       }
     },
     "glibc": {
-      "evra": "2.38-16.fc39.aarch64",
+      "evra": "2.38-17.fc39.aarch64",
       "metadata": {
         "sourcerpm": "glibc"
       }
     },
     "glibc-common": {
-      "evra": "2.38-16.fc39.aarch64",
+      "evra": "2.38-17.fc39.aarch64",
       "metadata": {
         "sourcerpm": "glibc"
       }
     },
     "glibc-gconv-extra": {
-      "evra": "2.38-16.fc39.aarch64",
+      "evra": "2.38-17.fc39.aarch64",
       "metadata": {
         "sourcerpm": "glibc"
       }
     },
     "glibc-minimal-langpack": {
-      "evra": "2.38-16.fc39.aarch64",
+      "evra": "2.38-17.fc39.aarch64",
       "metadata": {
         "sourcerpm": "glibc"
       }
@@ -829,7 +829,7 @@
       }
     },
     "gnutls": {
-      "evra": "3.8.3-1.fc39.aarch64",
+      "evra": "3.8.4-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "gnutls"
       }
@@ -1057,25 +1057,25 @@
       }
     },
     "kernel": {
-      "evra": "6.7.9-200.fc39.aarch64",
+      "evra": "6.8.4-200.fc39.aarch64",
       "metadata": {
         "sourcerpm": "kernel"
       }
     },
     "kernel-core": {
-      "evra": "6.7.9-200.fc39.aarch64",
+      "evra": "6.8.4-200.fc39.aarch64",
       "metadata": {
         "sourcerpm": "kernel"
       }
     },
     "kernel-modules": {
-      "evra": "6.7.9-200.fc39.aarch64",
+      "evra": "6.8.4-200.fc39.aarch64",
       "metadata": {
         "sourcerpm": "kernel"
       }
     },
     "kernel-modules-core": {
-      "evra": "6.7.9-200.fc39.aarch64",
+      "evra": "6.8.4-200.fc39.aarch64",
       "metadata": {
         "sourcerpm": "kernel"
       }
@@ -1243,7 +1243,7 @@
       }
     },
     "libeconf": {
-      "evra": "0.5.2-1.fc39.aarch64",
+      "evra": "0.5.2-2.fc39.aarch64",
       "metadata": {
         "sourcerpm": "libeconf"
       }
@@ -1513,7 +1513,7 @@
       }
     },
     "librepo": {
-      "evra": "1.17.0-1.fc39.aarch64",
+      "evra": "1.17.1-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "librepo"
       }
@@ -1723,7 +1723,7 @@
       }
     },
     "libxmlb": {
-      "evra": "0.3.15-1.fc39.aarch64",
+      "evra": "0.3.17-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "libxmlb"
       }
@@ -1735,7 +1735,7 @@
       }
     },
     "libzstd": {
-      "evra": "1.5.5-4.fc39.aarch64",
+      "evra": "1.5.6-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "zstd"
       }
@@ -1909,7 +1909,7 @@
       }
     },
     "nmstate": {
-      "evra": "2.2.21-2.fc39.aarch64",
+      "evra": "2.2.26-2.fc39.aarch64",
       "metadata": {
         "sourcerpm": "nmstate"
       }
@@ -1999,13 +1999,13 @@
       }
     },
     "ostree": {
-      "evra": "2024.4-1.fc39.aarch64",
+      "evra": "2024.5-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "ostree"
       }
     },
     "ostree-libs": {
-      "evra": "2024.4-1.fc39.aarch64",
+      "evra": "2024.5-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "ostree"
       }
@@ -2089,13 +2089,13 @@
       }
     },
     "podman": {
-      "evra": "5:4.9.3-1.fc39.aarch64",
+      "evra": "5:4.9.4-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "podman"
       }
     },
     "podman-plugins": {
-      "evra": "5:4.9.3-1.fc39.aarch64",
+      "evra": "5:4.9.4-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "podman"
       }
@@ -2191,13 +2191,13 @@
       }
     },
     "rpm-ostree": {
-      "evra": "2024.3-3.fc39.aarch64",
+      "evra": "2024.4-3.fc39.aarch64",
       "metadata": {
         "sourcerpm": "rpm-ostree"
       }
     },
     "rpm-ostree-libs": {
-      "evra": "2024.3-3.fc39.aarch64",
+      "evra": "2024.4-3.fc39.aarch64",
       "metadata": {
         "sourcerpm": "rpm-ostree"
       }
@@ -2305,7 +2305,7 @@
       }
     },
     "skopeo": {
-      "evra": "1:1.14.2-1.fc39.aarch64",
+      "evra": "1:1.15.0-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "skopeo"
       }
@@ -2611,23 +2611,23 @@
       }
     },
     "zstd": {
-      "evra": "1.5.5-4.fc39.aarch64",
+      "evra": "1.5.6-1.fc39.aarch64",
       "metadata": {
         "sourcerpm": "zstd"
       }
     }
   },
   "metadata": {
-    "generated": "2024-03-22T00:00:00Z",
+    "generated": "2024-04-07T00:00:00Z",
     "rpmmd_repos": {
       "fedora": {
         "generated": "2023-11-01T00:12:29Z"
       },
       "fedora-coreos-pool": {
-        "generated": "2024-03-22T06:28:28Z"
+        "generated": "2024-04-07T17:50:51Z"
       },
       "fedora-updates": {
-        "generated": "2024-03-22T01:10:09Z"
+        "generated": "2024-04-07T01:16:43Z"
       }
     }
   }
diff --git a/manifest-lock.ppc64le.json b/manifest-lock.ppc64le.json
index 493a054734..b439e803b8 100644
--- a/manifest-lock.ppc64le.json
+++ b/manifest-lock.ppc64le.json
@@ -193,7 +193,7 @@
       }
     },
     "btrfs-progs": {
-      "evra": "6.7.1-1.fc39.ppc64le",
+      "evra": "6.8-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "btrfs-progs"
       }
@@ -253,25 +253,25 @@
       }
     },
     "clevis": {
-      "evra": "19-4.fc39.ppc64le",
+      "evra": "20-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "clevis"
       }
     },
     "clevis-dracut": {
-      "evra": "19-4.fc39.ppc64le",
+      "evra": "20-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "clevis"
       }
     },
     "clevis-luks": {
-      "evra": "19-4.fc39.ppc64le",
+      "evra": "20-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "clevis"
       }
     },
     "clevis-systemd": {
-      "evra": "19-4.fc39.ppc64le",
+      "evra": "20-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "clevis"
       }
@@ -589,7 +589,7 @@
       }
     },
     "expat": {
-      "evra": "2.6.0-1.fc39.ppc64le",
+      "evra": "2.6.2-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "expat"
       }
@@ -697,7 +697,7 @@
       }
     },
     "fuse-sshfs": {
-      "evra": "3.7.3-4.fc39.ppc64le",
+      "evra": "3.7.3-9.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "fuse-sshfs"
       }
@@ -715,7 +715,7 @@
       }
     },
     "fwupd": {
-      "evra": "1.9.15-1.fc39.ppc64le",
+      "evra": "1.9.16-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "fwupd"
       }
@@ -769,25 +769,25 @@
       }
     },
     "glibc": {
-      "evra": "2.38-16.fc39.ppc64le",
+      "evra": "2.38-17.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "glibc"
       }
     },
     "glibc-common": {
-      "evra": "2.38-16.fc39.ppc64le",
+      "evra": "2.38-17.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "glibc"
       }
     },
     "glibc-gconv-extra": {
-      "evra": "2.38-16.fc39.ppc64le",
+      "evra": "2.38-17.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "glibc"
       }
     },
     "glibc-minimal-langpack": {
-      "evra": "2.38-16.fc39.ppc64le",
+      "evra": "2.38-17.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "glibc"
       }
@@ -805,7 +805,7 @@
       }
     },
     "gnutls": {
-      "evra": "3.8.3-1.fc39.ppc64le",
+      "evra": "3.8.4-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "gnutls"
       }
@@ -1033,25 +1033,25 @@
       }
     },
     "kernel": {
-      "evra": "6.7.9-200.fc39.ppc64le",
+      "evra": "6.8.4-200.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "kernel"
       }
     },
     "kernel-core": {
-      "evra": "6.7.9-200.fc39.ppc64le",
+      "evra": "6.8.4-200.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "kernel"
       }
     },
     "kernel-modules": {
-      "evra": "6.7.9-200.fc39.ppc64le",
+      "evra": "6.8.4-200.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "kernel"
       }
     },
     "kernel-modules-core": {
-      "evra": "6.7.9-200.fc39.ppc64le",
+      "evra": "6.8.4-200.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "kernel"
       }
@@ -1219,7 +1219,7 @@
       }
     },
     "libeconf": {
-      "evra": "0.5.2-1.fc39.ppc64le",
+      "evra": "0.5.2-2.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "libeconf"
       }
@@ -1489,7 +1489,7 @@
       }
     },
     "librepo": {
-      "evra": "1.17.0-1.fc39.ppc64le",
+      "evra": "1.17.1-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "librepo"
       }
@@ -1711,7 +1711,7 @@
       }
     },
     "libxmlb": {
-      "evra": "0.3.15-1.fc39.ppc64le",
+      "evra": "0.3.17-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "libxmlb"
       }
@@ -1723,7 +1723,7 @@
       }
     },
     "libzstd": {
-      "evra": "1.5.5-4.fc39.ppc64le",
+      "evra": "1.5.6-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "zstd"
       }
@@ -1891,7 +1891,7 @@
       }
     },
     "nmstate": {
-      "evra": "2.2.21-2.fc39.ppc64le",
+      "evra": "2.2.26-2.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "nmstate"
       }
@@ -1981,19 +1981,19 @@
       }
     },
     "ostree": {
-      "evra": "2024.4-1.fc39.ppc64le",
+      "evra": "2024.5-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "ostree"
       }
     },
     "ostree-grub2": {
-      "evra": "2024.4-1.fc39.ppc64le",
+      "evra": "2024.5-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "ostree"
       }
     },
     "ostree-libs": {
-      "evra": "2024.4-1.fc39.ppc64le",
+      "evra": "2024.5-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "ostree"
       }
@@ -2077,13 +2077,13 @@
       }
     },
     "podman": {
-      "evra": "5:4.9.3-1.fc39.ppc64le",
+      "evra": "5:4.9.4-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "podman"
       }
     },
     "podman-plugins": {
-      "evra": "5:4.9.3-1.fc39.ppc64le",
+      "evra": "5:4.9.4-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "podman"
       }
@@ -2191,13 +2191,13 @@
       }
     },
     "rpm-ostree": {
-      "evra": "2024.3-3.fc39.ppc64le",
+      "evra": "2024.4-3.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "rpm-ostree"
       }
     },
     "rpm-ostree-libs": {
-      "evra": "2024.3-3.fc39.ppc64le",
+      "evra": "2024.4-3.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "rpm-ostree"
       }
@@ -2305,7 +2305,7 @@
       }
     },
     "skopeo": {
-      "evra": "1:1.14.2-1.fc39.ppc64le",
+      "evra": "1:1.15.0-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "skopeo"
       }
@@ -2599,23 +2599,23 @@
       }
     },
     "zstd": {
-      "evra": "1.5.5-4.fc39.ppc64le",
+      "evra": "1.5.6-1.fc39.ppc64le",
       "metadata": {
         "sourcerpm": "zstd"
       }
     }
   },
   "metadata": {
-    "generated": "2024-03-22T00:00:00Z",
+    "generated": "2024-04-07T00:00:00Z",
     "rpmmd_repos": {
       "fedora": {
         "generated": "2023-11-01T00:12:28Z"
       },
       "fedora-coreos-pool": {
-        "generated": "2024-03-22T06:27:29Z"
+        "generated": "2024-04-07T17:49:39Z"
       },
       "fedora-updates": {
-        "generated": "2024-03-22T01:10:18Z"
+        "generated": "2024-04-07T01:16:51Z"
       }
     }
   }
diff --git a/manifest-lock.s390x.json b/manifest-lock.s390x.json
index 990c070737..a32be14dbe 100644
--- a/manifest-lock.s390x.json
+++ b/manifest-lock.s390x.json
@@ -187,7 +187,7 @@
       }
     },
     "btrfs-progs": {
-      "evra": "6.7.1-1.fc39.s390x",
+      "evra": "6.8-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "btrfs-progs"
       }
@@ -247,25 +247,25 @@
       }
     },
     "clevis": {
-      "evra": "19-4.fc39.s390x",
+      "evra": "20-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "clevis"
       }
     },
     "clevis-dracut": {
-      "evra": "19-4.fc39.s390x",
+      "evra": "20-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "clevis"
       }
     },
     "clevis-luks": {
-      "evra": "19-4.fc39.s390x",
+      "evra": "20-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "clevis"
       }
     },
     "clevis-systemd": {
-      "evra": "19-4.fc39.s390x",
+      "evra": "20-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "clevis"
       }
@@ -583,7 +583,7 @@
       }
     },
     "expat": {
-      "evra": "2.6.0-1.fc39.s390x",
+      "evra": "2.6.2-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "expat"
       }
@@ -691,7 +691,7 @@
       }
     },
     "fuse-sshfs": {
-      "evra": "3.7.3-4.fc39.s390x",
+      "evra": "3.7.3-9.fc39.s390x",
       "metadata": {
         "sourcerpm": "fuse-sshfs"
       }
@@ -709,7 +709,7 @@
       }
     },
     "fwupd": {
-      "evra": "1.9.15-1.fc39.s390x",
+      "evra": "1.9.16-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "fwupd"
       }
@@ -745,25 +745,25 @@
       }
     },
     "glibc": {
-      "evra": "2.38-16.fc39.s390x",
+      "evra": "2.38-17.fc39.s390x",
       "metadata": {
         "sourcerpm": "glibc"
       }
     },
     "glibc-common": {
-      "evra": "2.38-16.fc39.s390x",
+      "evra": "2.38-17.fc39.s390x",
       "metadata": {
         "sourcerpm": "glibc"
       }
     },
     "glibc-gconv-extra": {
-      "evra": "2.38-16.fc39.s390x",
+      "evra": "2.38-17.fc39.s390x",
       "metadata": {
         "sourcerpm": "glibc"
       }
     },
     "glibc-minimal-langpack": {
-      "evra": "2.38-16.fc39.s390x",
+      "evra": "2.38-17.fc39.s390x",
       "metadata": {
         "sourcerpm": "glibc"
       }
@@ -781,7 +781,7 @@
       }
     },
     "gnutls": {
-      "evra": "3.8.3-1.fc39.s390x",
+      "evra": "3.8.4-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "gnutls"
       }
@@ -973,25 +973,25 @@
       }
     },
     "kernel": {
-      "evra": "6.7.9-200.fc39.s390x",
+      "evra": "6.8.4-200.fc39.s390x",
       "metadata": {
         "sourcerpm": "kernel"
       }
     },
     "kernel-core": {
-      "evra": "6.7.9-200.fc39.s390x",
+      "evra": "6.8.4-200.fc39.s390x",
       "metadata": {
         "sourcerpm": "kernel"
       }
     },
     "kernel-modules": {
-      "evra": "6.7.9-200.fc39.s390x",
+      "evra": "6.8.4-200.fc39.s390x",
       "metadata": {
         "sourcerpm": "kernel"
       }
     },
     "kernel-modules-core": {
-      "evra": "6.7.9-200.fc39.s390x",
+      "evra": "6.8.4-200.fc39.s390x",
       "metadata": {
         "sourcerpm": "kernel"
       }
@@ -1159,7 +1159,7 @@
       }
     },
     "libeconf": {
-      "evra": "0.5.2-1.fc39.s390x",
+      "evra": "0.5.2-2.fc39.s390x",
       "metadata": {
         "sourcerpm": "libeconf"
       }
@@ -1429,7 +1429,7 @@
       }
     },
     "librepo": {
-      "evra": "1.17.0-1.fc39.s390x",
+      "evra": "1.17.1-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "librepo"
       }
@@ -1639,7 +1639,7 @@
       }
     },
     "libxmlb": {
-      "evra": "0.3.15-1.fc39.s390x",
+      "evra": "0.3.17-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "libxmlb"
       }
@@ -1651,7 +1651,7 @@
       }
     },
     "libzstd": {
-      "evra": "1.5.5-4.fc39.s390x",
+      "evra": "1.5.6-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "zstd"
       }
@@ -1819,7 +1819,7 @@
       }
     },
     "nmstate": {
-      "evra": "2.2.21-2.fc39.s390x",
+      "evra": "2.2.26-2.fc39.s390x",
       "metadata": {
         "sourcerpm": "nmstate"
       }
@@ -1897,13 +1897,13 @@
       }
     },
     "ostree": {
-      "evra": "2024.4-1.fc39.s390x",
+      "evra": "2024.5-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "ostree"
       }
     },
     "ostree-libs": {
-      "evra": "2024.4-1.fc39.s390x",
+      "evra": "2024.5-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "ostree"
       }
@@ -1987,13 +1987,13 @@
       }
     },
     "podman": {
-      "evra": "5:4.9.3-1.fc39.s390x",
+      "evra": "5:4.9.4-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "podman"
       }
     },
     "podman-plugins": {
-      "evra": "5:4.9.3-1.fc39.s390x",
+      "evra": "5:4.9.4-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "podman"
       }
@@ -2089,13 +2089,13 @@
       }
     },
     "rpm-ostree": {
-      "evra": "2024.3-3.fc39.s390x",
+      "evra": "2024.4-3.fc39.s390x",
       "metadata": {
         "sourcerpm": "rpm-ostree"
       }
     },
     "rpm-ostree-libs": {
-      "evra": "2024.3-3.fc39.s390x",
+      "evra": "2024.4-3.fc39.s390x",
       "metadata": {
         "sourcerpm": "rpm-ostree"
       }
@@ -2203,7 +2203,7 @@
       }
     },
     "skopeo": {
-      "evra": "1:1.14.2-1.fc39.s390x",
+      "evra": "1:1.15.0-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "skopeo"
       }
@@ -2503,23 +2503,23 @@
       }
     },
     "zstd": {
-      "evra": "1.5.5-4.fc39.s390x",
+      "evra": "1.5.6-1.fc39.s390x",
       "metadata": {
         "sourcerpm": "zstd"
       }
     }
   },
   "metadata": {
-    "generated": "2024-03-22T00:00:00Z",
+    "generated": "2024-04-07T00:00:00Z",
     "rpmmd_repos": {
       "fedora": {
         "generated": "2023-11-01T00:12:19Z"
       },
       "fedora-coreos-pool": {
-        "generated": "2024-03-22T06:27:14Z"
+        "generated": "2024-04-07T17:49:20Z"
       },
       "fedora-updates": {
-        "generated": "2024-03-22T01:10:27Z"
+        "generated": "2024-04-07T01:16:59Z"
       }
     }
   }
diff --git a/manifest-lock.x86_64.json b/manifest-lock.x86_64.json
index 66d6aa041c..c3e4a1f3aa 100644
--- a/manifest-lock.x86_64.json
+++ b/manifest-lock.x86_64.json
@@ -187,7 +187,7 @@
       }
     },
     "btrfs-progs": {
-      "evra": "6.7.1-1.fc39.x86_64",
+      "evra": "6.8-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "btrfs-progs"
       }
@@ -247,25 +247,25 @@
       }
     },
     "clevis": {
-      "evra": "19-4.fc39.x86_64",
+      "evra": "20-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "clevis"
       }
     },
     "clevis-dracut": {
-      "evra": "19-4.fc39.x86_64",
+      "evra": "20-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "clevis"
       }
     },
     "clevis-luks": {
-      "evra": "19-4.fc39.x86_64",
+      "evra": "20-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "clevis"
       }
     },
     "clevis-systemd": {
-      "evra": "19-4.fc39.x86_64",
+      "evra": "20-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "clevis"
       }
@@ -607,7 +607,7 @@
       }
     },
     "expat": {
-      "evra": "2.6.0-1.fc39.x86_64",
+      "evra": "2.6.2-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "expat"
       }
@@ -721,7 +721,7 @@
       }
     },
     "fuse-sshfs": {
-      "evra": "3.7.3-4.fc39.x86_64",
+      "evra": "3.7.3-9.fc39.x86_64",
       "metadata": {
         "sourcerpm": "fuse-sshfs"
       }
@@ -739,7 +739,7 @@
       }
     },
     "fwupd": {
-      "evra": "1.9.15-1.fc39.x86_64",
+      "evra": "1.9.16-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "fwupd"
       }
@@ -793,25 +793,25 @@
       }
     },
     "glibc": {
-      "evra": "2.38-16.fc39.x86_64",
+      "evra": "2.38-17.fc39.x86_64",
       "metadata": {
         "sourcerpm": "glibc"
       }
     },
     "glibc-common": {
-      "evra": "2.38-16.fc39.x86_64",
+      "evra": "2.38-17.fc39.x86_64",
       "metadata": {
         "sourcerpm": "glibc"
       }
     },
     "glibc-gconv-extra": {
-      "evra": "2.38-16.fc39.x86_64",
+      "evra": "2.38-17.fc39.x86_64",
       "metadata": {
         "sourcerpm": "glibc"
       }
     },
     "glibc-minimal-langpack": {
-      "evra": "2.38-16.fc39.x86_64",
+      "evra": "2.38-17.fc39.x86_64",
       "metadata": {
         "sourcerpm": "glibc"
       }
@@ -829,7 +829,7 @@
       }
     },
     "gnutls": {
-      "evra": "3.8.3-1.fc39.x86_64",
+      "evra": "3.8.4-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "gnutls"
       }
@@ -1069,25 +1069,25 @@
       }
     },
     "kernel": {
-      "evra": "6.7.9-200.fc39.x86_64",
+      "evra": "6.8.4-200.fc39.x86_64",
       "metadata": {
         "sourcerpm": "kernel"
       }
     },
     "kernel-core": {
-      "evra": "6.7.9-200.fc39.x86_64",
+      "evra": "6.8.4-200.fc39.x86_64",
       "metadata": {
         "sourcerpm": "kernel"
       }
     },
     "kernel-modules": {
-      "evra": "6.7.9-200.fc39.x86_64",
+      "evra": "6.8.4-200.fc39.x86_64",
       "metadata": {
         "sourcerpm": "kernel"
       }
     },
     "kernel-modules-core": {
-      "evra": "6.7.9-200.fc39.x86_64",
+      "evra": "6.8.4-200.fc39.x86_64",
       "metadata": {
         "sourcerpm": "kernel"
       }
@@ -1255,7 +1255,7 @@
       }
     },
     "libeconf": {
-      "evra": "0.5.2-1.fc39.x86_64",
+      "evra": "0.5.2-2.fc39.x86_64",
       "metadata": {
         "sourcerpm": "libeconf"
       }
@@ -1525,7 +1525,7 @@
       }
     },
     "librepo": {
-      "evra": "1.17.0-1.fc39.x86_64",
+      "evra": "1.17.1-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "librepo"
       }
@@ -1735,7 +1735,7 @@
       }
     },
     "libxmlb": {
-      "evra": "0.3.15-1.fc39.x86_64",
+      "evra": "0.3.17-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "libxmlb"
       }
@@ -1747,7 +1747,7 @@
       }
     },
     "libzstd": {
-      "evra": "1.5.5-4.fc39.x86_64",
+      "evra": "1.5.6-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "zstd"
       }
@@ -1927,7 +1927,7 @@
       }
     },
     "nmstate": {
-      "evra": "2.2.21-2.fc39.x86_64",
+      "evra": "2.2.26-2.fc39.x86_64",
       "metadata": {
         "sourcerpm": "nmstate"
       }
@@ -2017,13 +2017,13 @@
       }
     },
     "ostree": {
-      "evra": "2024.4-1.fc39.x86_64",
+      "evra": "2024.5-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "ostree"
       }
     },
     "ostree-libs": {
-      "evra": "2024.4-1.fc39.x86_64",
+      "evra": "2024.5-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "ostree"
       }
@@ -2107,13 +2107,13 @@
       }
     },
     "podman": {
-      "evra": "5:4.9.3-1.fc39.x86_64",
+      "evra": "5:4.9.4-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "podman"
       }
     },
     "podman-plugins": {
-      "evra": "5:4.9.3-1.fc39.x86_64",
+      "evra": "5:4.9.4-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "podman"
       }
@@ -2203,13 +2203,13 @@
       }
     },
     "rpm-ostree": {
-      "evra": "2024.3-3.fc39.x86_64",
+      "evra": "2024.4-3.fc39.x86_64",
       "metadata": {
         "sourcerpm": "rpm-ostree"
       }
     },
     "rpm-ostree-libs": {
-      "evra": "2024.3-3.fc39.x86_64",
+      "evra": "2024.4-3.fc39.x86_64",
       "metadata": {
         "sourcerpm": "rpm-ostree"
       }
@@ -2317,7 +2317,7 @@
       }
     },
     "skopeo": {
-      "evra": "1:1.14.2-1.fc39.x86_64",
+      "evra": "1:1.15.0-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "skopeo"
       }
@@ -2623,23 +2623,23 @@
       }
     },
     "zstd": {
-      "evra": "1.5.5-4.fc39.x86_64",
+      "evra": "1.5.6-1.fc39.x86_64",
       "metadata": {
         "sourcerpm": "zstd"
       }
     }
   },
   "metadata": {
-    "generated": "2024-03-22T00:00:00Z",
+    "generated": "2024-04-07T00:00:00Z",
     "rpmmd_repos": {
       "fedora": {
         "generated": "2023-11-01T00:12:39Z"
       },
       "fedora-coreos-pool": {
-        "generated": "2024-03-22T06:28:31Z"
+        "generated": "2024-04-07T17:50:50Z"
       },
       "fedora-updates": {
-        "generated": "2024-03-22T01:10:35Z"
+        "generated": "2024-04-07T01:17:08Z"
       }
     }
   }
diff --git a/manifests/exclude-dnf.yaml b/manifests/exclude-dnf.yaml
new file mode 100644
index 0000000000..dc51914b9f
--- /dev/null
+++ b/manifests/exclude-dnf.yaml
@@ -0,0 +1,3 @@
+exclude-packages:
+  - dnf
+  - dnf5
diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml
index 57fe09ac96..d58d72c4dd 100644
--- a/manifests/fedora-coreos-base.yaml
+++ b/manifests/fedora-coreos-base.yaml
@@ -150,9 +150,6 @@ packages:
   - console-login-helper-messages-motdgen
   # i18n
   - kbd
-  # zram-generator (but not zram-generator-defaults) for F33 change
-  # https://github.com/coreos/fedora-coreos-tracker/issues/509
-  - zram-generator
   # resolved was broken out to its own package in rawhide/f35
   - systemd-resolved
   # In F35+ need `iptables-legacy` package
@@ -161,7 +158,7 @@ packages:
   # GPU Firmware files (not broken out into subpackage of linux-firmware in RHEL yet)
   - amd-gpu-firmware intel-gpu-firmware nvidia-gpu-firmware
   # Wifi/BT firmware files https://github.com/coreos/fedora-coreos-tracker/issues/1575
-  - atheros-firmware brcmfmac-firmware mt7xxx-firmware realtek-firmware
+  - atheros-firmware brcmfmac-firmware mt7xxx-firmware realtek-firmware nxpwireless-firmware tiwilink-firmware
 
 
 # - irqbalance
diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml
index a7dd32e03d..ada7419b8a 100644
--- a/manifests/fedora-coreos.yaml
+++ b/manifests/fedora-coreos.yaml
@@ -36,6 +36,13 @@ conditional-include:
   - if: releasever >= 41
     # Include makedumpfile subpackage from kexec-tools (new in F41+)
     include: makedumpfile.yaml
+  # On <41, we want to keep making sure dnf doesn't slip in somehow
+  # On 41+, we do want it
+  # https://github.com/coreos/fedora-coreos-tracker/issues/1687
+  - if: releasever < 41
+    include: exclude-dnf.yaml
+  - if: releasever >= 41
+    include: include-dnf.yaml
 
 ostree-layers:
   - overlay/15fcos
@@ -163,7 +170,6 @@ exclude-packages:
   - perl
   - perl-interpreter
   - nodejs
-  - dnf
   - grubby
   - cowsay  # Just in case
   # Let's make sure initscripts doesn't get pulled back in
diff --git a/manifests/include-dnf.yaml b/manifests/include-dnf.yaml
new file mode 100644
index 0000000000..f98d98aa73
--- /dev/null
+++ b/manifests/include-dnf.yaml
@@ -0,0 +1,13 @@
+packages:
+  - dnf5
+
+# until dnf5 becomes the default, manually symlink dnf to it
+postprocess:
+  - |
+    #!/usr/bin/bash
+    set -euo pipefail
+    if command -v dnf; then
+      echo 'dnf5 is now the default, remove this postprocess script!' >&2
+      exit 1
+    fi
+    ln -s dnf5 /usr/bin/dnf
diff --git a/manifests/system-configuration.yaml b/manifests/system-configuration.yaml
index dc86093815..0f982b612d 100644
--- a/manifests/system-configuration.yaml
+++ b/manifests/system-configuration.yaml
@@ -43,6 +43,9 @@ packages:
   - ssh-key-dir
   # Allow for configuring different timezones
   - tzdata
+  # zram-generator (but not zram-generator-defaults) for F33 change
+  # https://github.com/coreos/fedora-coreos-tracker/issues/509
+  - zram-generator
 
 postprocess:
   # Mask systemd-repart. Ignition is responsible for partition setup on first
diff --git a/tests/kola/ignition/delete-config/test.sh b/tests/kola/ignition/delete-config/test.sh
index 0cd4c1de2b..46b3b29e4a 100755
--- a/tests/kola/ignition/delete-config/test.sh
+++ b/tests/kola/ignition/delete-config/test.sh
@@ -29,6 +29,10 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in
 "")
     # Ignition boot
 
+    # https://github.com/coreos/ignition/issues/1833
+    if [ $(stat --format="%a" /etc/systemd/system/ignition-delete-config.service.d/50-kola.conf) != "644" ]; then
+        fatal "dropin file permission should be 644"
+    fi
     if [ ! -e /run/ignition-rmcfg-ran ]; then
         fatal "mocked ignition-rmcfg did not run on first boot"
     fi