diff --git a/ci/buildroot/install-buildroot.sh b/ci/buildroot/install-buildroot.sh index eb4d84502d..2809b8a8f7 100755 --- a/ci/buildroot/install-buildroot.sh +++ b/ci/buildroot/install-buildroot.sh @@ -3,6 +3,10 @@ set -euo pipefail # This is invoked by Dockerfile +dnf -y install dnf-plugins-core +# We want to avoid a 7 day cycle for e.g. new ostree etc. +dnf config-manager --set-enabled updates-testing + dn=$(dirname "$0") tmpd=$(mktemp -d) && trap 'rm -rf ${tmpd}' EXIT diff --git a/manifest-lock.aarch64.json b/manifest-lock.aarch64.json index ec0f09feda..9223c1b42b 100644 --- a/manifest-lock.aarch64.json +++ b/manifest-lock.aarch64.json @@ -19,7 +19,7 @@ "evra": "2.9.0.4-4.fc39.noarch" }, "aardvark-dns": { - "evra": "1.7.0-2.fc39.aarch64" + "evra": "1.8.0-1.fc39.aarch64" }, "acl": { "evra": "2.3.1-8.fc39.aarch64" @@ -427,7 +427,7 @@ "evra": "1:2.06-104.fc39.aarch64" }, "gvisor-tap-vsock-gvforwarder": { - "evra": "6:0.7.0-6.fc39.aarch64" + "evra": "6:0.7.1-1.fc39.aarch64" }, "gzip": { "evra": "1.12-6.fc39.aarch64" @@ -514,16 +514,16 @@ "evra": "2.6.3-1.fc39.noarch" }, "kernel": { - "evra": "6.5.6-300.fc39.aarch64" + "evra": "6.5.7-300.fc39.aarch64" }, "kernel-core": { - "evra": "6.5.6-300.fc39.aarch64" + "evra": "6.5.7-300.fc39.aarch64" }, "kernel-modules": { - "evra": "6.5.6-300.fc39.aarch64" + "evra": "6.5.7-300.fc39.aarch64" }, "kernel-modules-core": { - "evra": "6.5.6-300.fc39.aarch64" + "evra": "6.5.7-300.fc39.aarch64" }, "kexec-tools": { "evra": "2.0.27-1.fc39.aarch64" @@ -1279,7 +1279,7 @@ "evra": "1.3.2-1.fc39.aarch64" }, "zincati": { - "evra": "0.0.25-6.fc39.aarch64" + "evra": "0.0.26-2.fc39.aarch64" }, "zlib": { "evra": "1.2.13-4.fc39.aarch64" @@ -1292,13 +1292,13 @@ } }, "metadata": { - "generated": "2023-10-16T00:00:00Z", + "generated": "2023-10-22T00:00:00Z", "rpmmd_repos": { "fedora-coreos-pool": { - "generated": "2023-10-16T00:42:49Z" + "generated": "2023-10-20T15:55:24Z" }, "fedora-next": { - "generated": "2023-10-15T09:51:59Z" + "generated": "2023-10-19T09:52:56Z" }, "fedora-next-updates": { "generated": "2018-02-20T19:13:29Z" diff --git a/manifest-lock.overrides.yaml b/manifest-lock.overrides.yaml index 0a9bc813b0..a866599ea4 100644 --- a/manifest-lock.overrides.yaml +++ b/manifest-lock.overrides.yaml @@ -9,6 +9,12 @@ # for FCOS-specific packages (ignition, afterburn, etc.). packages: + aardvark-dns: + evr: 1.8.0-1.fc39 + metadata: + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-d97c0821fa + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468 + type: fast-track bind-libs: evr: 32:9.18.19-1.fc39 metadata: @@ -38,12 +44,6 @@ packages: bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-3e03106a9e reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468 type: fast-track - curl: - evr: 8.2.1-3.fc39 - metadata: - bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-0f8d1871d8 - reason: https://github.com/coreos/fedora-coreos-tracker/issues/1593 - type: fast-track fwupd: evr: 1.9.6-1.fc39 metadata: @@ -62,11 +62,29 @@ packages: bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-817ed9e906 reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468 type: fast-track - libcurl-minimal: - evr: 8.2.1-3.fc39 + kernel: + evr: 6.5.7-300.fc39 metadata: - bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-0f8d1871d8 - reason: https://github.com/coreos/fedora-coreos-tracker/issues/1593 + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-3747088120 + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468 + type: fast-track + kernel-core: + evr: 6.5.7-300.fc39 + metadata: + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-3747088120 + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468 + type: fast-track + kernel-modules: + evr: 6.5.7-300.fc39 + metadata: + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-3747088120 + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468 + type: fast-track + kernel-modules-core: + evr: 6.5.7-300.fc39 + metadata: + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-3747088120 + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468 type: fast-track libnet: evr: 1.3-1.fc39 @@ -146,3 +164,8 @@ packages: bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-14ee3e26c2 reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468 type: fast-track + zincati: + evr: 0.0.26-2.fc39 + metadata: + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-586e8dc477 + type: fast-track diff --git a/manifest-lock.ppc64le.json b/manifest-lock.ppc64le.json index db7ee221b0..1c3357df61 100644 --- a/manifest-lock.ppc64le.json +++ b/manifest-lock.ppc64le.json @@ -19,7 +19,7 @@ "evra": "2.9.0.4-4.fc39.noarch" }, "aardvark-dns": { - "evra": "1.7.0-2.fc39.ppc64le" + "evra": "1.8.0-1.fc39.ppc64le" }, "acl": { "evra": "2.3.1-8.fc39.ppc64le" @@ -412,7 +412,7 @@ "evra": "1:2.06-104.fc39.ppc64le" }, "gvisor-tap-vsock-gvforwarder": { - "evra": "6:0.7.0-6.fc39.ppc64le" + "evra": "6:0.7.1-1.fc39.ppc64le" }, "gzip": { "evra": "1.12-6.fc39.ppc64le" @@ -499,16 +499,16 @@ "evra": "2.6.3-1.fc39.noarch" }, "kernel": { - "evra": "6.5.6-300.fc39.ppc64le" + "evra": "6.5.7-300.fc39.ppc64le" }, "kernel-core": { - "evra": "6.5.6-300.fc39.ppc64le" + "evra": "6.5.7-300.fc39.ppc64le" }, "kernel-modules": { - "evra": "6.5.6-300.fc39.ppc64le" + "evra": "6.5.7-300.fc39.ppc64le" }, "kernel-modules-core": { - "evra": "6.5.6-300.fc39.ppc64le" + "evra": "6.5.7-300.fc39.ppc64le" }, "kexec-tools": { "evra": "2.0.27-1.fc39.ppc64le" @@ -1270,7 +1270,7 @@ "evra": "1.3.2-1.fc39.ppc64le" }, "zincati": { - "evra": "0.0.25-6.fc39.ppc64le" + "evra": "0.0.26-2.fc39.ppc64le" }, "zlib": { "evra": "1.2.13-4.fc39.ppc64le" @@ -1283,13 +1283,13 @@ } }, "metadata": { - "generated": "2023-10-16T00:00:00Z", + "generated": "2023-10-22T00:00:00Z", "rpmmd_repos": { "fedora-coreos-pool": { - "generated": "2023-10-16T00:41:58Z" + "generated": "2023-10-20T15:53:18Z" }, "fedora-next": { - "generated": "2023-10-15T09:51:55Z" + "generated": "2023-10-19T09:52:50Z" }, "fedora-next-updates": { "generated": "2018-02-28T16:06:00Z" diff --git a/manifest-lock.s390x.json b/manifest-lock.s390x.json index d777e0d380..bff07dd637 100644 --- a/manifest-lock.s390x.json +++ b/manifest-lock.s390x.json @@ -19,7 +19,7 @@ "evra": "2.9.0.4-4.fc39.noarch" }, "aardvark-dns": { - "evra": "1.7.0-2.fc39.s390x" + "evra": "1.8.0-1.fc39.s390x" }, "acl": { "evra": "2.3.1-8.fc39.s390x" @@ -385,7 +385,7 @@ "evra": "3.11-3.fc39.s390x" }, "gvisor-tap-vsock-gvforwarder": { - "evra": "6:0.7.0-6.fc39.s390x" + "evra": "6:0.7.1-1.fc39.s390x" }, "gzip": { "evra": "1.12-6.fc39.s390x" @@ -469,16 +469,16 @@ "evra": "2.6.3-1.fc39.noarch" }, "kernel": { - "evra": "6.5.6-300.fc39.s390x" + "evra": "6.5.7-300.fc39.s390x" }, "kernel-core": { - "evra": "6.5.6-300.fc39.s390x" + "evra": "6.5.7-300.fc39.s390x" }, "kernel-modules": { - "evra": "6.5.6-300.fc39.s390x" + "evra": "6.5.7-300.fc39.s390x" }, "kernel-modules-core": { - "evra": "6.5.6-300.fc39.s390x" + "evra": "6.5.7-300.fc39.s390x" }, "kexec-tools": { "evra": "2.0.27-1.fc39.s390x" @@ -1222,7 +1222,7 @@ "evra": "1.3.2-1.fc39.s390x" }, "zincati": { - "evra": "0.0.25-6.fc39.s390x" + "evra": "0.0.26-2.fc39.s390x" }, "zlib": { "evra": "1.2.13-4.fc39.s390x" @@ -1235,13 +1235,13 @@ } }, "metadata": { - "generated": "2023-10-16T00:00:00Z", + "generated": "2023-10-22T00:00:00Z", "rpmmd_repos": { "fedora-coreos-pool": { - "generated": "2023-10-16T00:41:21Z" + "generated": "2023-10-20T15:54:00Z" }, "fedora-next": { - "generated": "2023-10-15T09:51:49Z" + "generated": "2023-10-19T09:52:50Z" }, "fedora-next-updates": { "generated": "2018-02-28T16:06:49Z" diff --git a/manifest-lock.x86_64.json b/manifest-lock.x86_64.json index c5037912e4..58c7f0f766 100644 --- a/manifest-lock.x86_64.json +++ b/manifest-lock.x86_64.json @@ -19,7 +19,7 @@ "evra": "2.9.0.4-4.fc39.noarch" }, "aardvark-dns": { - "evra": "1.7.0-2.fc39.x86_64" + "evra": "1.8.0-1.fc39.x86_64" }, "acl": { "evra": "2.3.1-8.fc39.x86_64" @@ -433,7 +433,7 @@ "evra": "1:2.06-104.fc39.x86_64" }, "gvisor-tap-vsock-gvforwarder": { - "evra": "6:0.7.0-6.fc39.x86_64" + "evra": "6:0.7.1-1.fc39.x86_64" }, "gzip": { "evra": "1.12-6.fc39.x86_64" @@ -520,16 +520,16 @@ "evra": "2.6.3-1.fc39.noarch" }, "kernel": { - "evra": "6.5.6-300.fc39.x86_64" + "evra": "6.5.7-300.fc39.x86_64" }, "kernel-core": { - "evra": "6.5.6-300.fc39.x86_64" + "evra": "6.5.7-300.fc39.x86_64" }, "kernel-modules": { - "evra": "6.5.6-300.fc39.x86_64" + "evra": "6.5.7-300.fc39.x86_64" }, "kernel-modules-core": { - "evra": "6.5.6-300.fc39.x86_64" + "evra": "6.5.7-300.fc39.x86_64" }, "kexec-tools": { "evra": "2.0.27-1.fc39.x86_64" @@ -1282,7 +1282,7 @@ "evra": "1.3.2-1.fc39.x86_64" }, "zincati": { - "evra": "0.0.25-6.fc39.x86_64" + "evra": "0.0.26-2.fc39.x86_64" }, "zlib": { "evra": "1.2.13-4.fc39.x86_64" @@ -1295,13 +1295,13 @@ } }, "metadata": { - "generated": "2023-10-16T00:00:00Z", + "generated": "2023-10-22T00:00:00Z", "rpmmd_repos": { "fedora-coreos-pool": { - "generated": "2023-10-16T00:42:57Z" + "generated": "2023-10-20T15:54:13Z" }, "fedora-next": { - "generated": "2023-10-15T09:52:13Z" + "generated": "2023-10-19T09:53:08Z" }, "fedora-next-updates": { "generated": "2018-02-20T19:18:14Z" diff --git a/tests/kola/rpm-ostree/kernel-replace b/tests/kola/rpm-ostree/kernel-replace index 0b51d570cc..a421a0b740 100755 --- a/tests/kola/rpm-ostree/kernel-replace +++ b/tests/kola/rpm-ostree/kernel-replace @@ -44,7 +44,7 @@ image=oci:$image_dir image_pull=ostree-unverified-image:$image tmp_imagedir=/var/tmp/fcos-tmp arch=$(arch) -kver="6.0.7-301.fc37.${arch}" +kver="6.2.9-300.fc38.${arch}" case "${AUTOPKGTEST_REBOOT_MARK:-}" in "") @@ -71,31 +71,11 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in td=$(mktemp -d) cd ${td} version=$(rpm-ostree --version | grep Version) -cat > dracut_call.sh << EOF -#!/bin/bash -# Temporary workaround for: https://github.com/coreos/rpm-ostree/issues/4190 -# This has been fixed on rpm-ostree 2022.18 and this script will be removed -# once that version reaches the stable coreos stream. -if [[ "$version" == *"2023"* ]] || [[ "$version" == *"2022.19"* ]]; then - echo "Running rpm-ostree 2022.19 or newer."; -else - echo "Running rpm-ostree 2022.18 or older, rebuilding the initramfs."; - echo "Building initramfs for Kernel: $kver" - /usr/libexec/rpm-ostree/wrapped/dracut --tmpdir /tmp/ --no-hostonly --kver $kver --reproducible \ - -v --add ostree -f /tmp/initramfs2.img - mv /tmp/initramfs2.img /lib/modules/$kver/initramfs.img -fi; -EOF cat > Dockerfile << EOF FROM localhost/fcos RUN rpm-ostree cliwrap install-to-root / -ADD dracut_call.sh dracut_call.sh -RUN cat dracut_call.sh -# Once kernel-modules-core is in all supported releases, we can remove this conditional. -RUN if rpm -q kernel-modules-core; then echo "kernel-modules-core installed.. removing"; remove="--remove kernel-modules-core"; fi && \ - chmod +x dracut_call.sh && rpm-ostree override replace \$remove \ - https://koji.fedoraproject.org/koji/buildinfo?buildID=2084352 && \ - ./dracut_call.sh && \ +RUN rpm-ostree override replace \ + https://koji.fedoraproject.org/koji/buildinfo?buildID=2178613 && \ ostree container commit EOF # Older podman found in RHEL8 blows up without /etc/resolv.conf