From 1978ada059d4d9c274af4f9560b459d5f079ee36 Mon Sep 17 00:00:00 2001 From: CoreOS Bot Date: Mon, 17 Oct 2022 16:56:55 +0000 Subject: [PATCH] tree: promote changes from testing at 053c7c4c4bcef5fbdbb4bdf81cecd3bde35223c4 --- kola-denylist.yaml | 14 +----- manifest-lock.aarch64.json | 44 +++++++++---------- manifest-lock.overrides.yaml | 12 +---- manifest-lock.ppc64le.json | 42 +++++++++--------- manifest-lock.s390x.json | 42 +++++++++--------- manifest-lock.x86_64.json | 42 +++++++++--------- manifests/fedora-coreos-base.yaml | 1 - manifests/fedora-coreos.yaml | 6 +-- .../coreos-liveiso-persist-osmet.service | 2 + .../modules.d/35coreos-live/live-generator | 36 ++++++++++++++- .../14NetworkManager-plugins/statoverride | 2 - .../conf.d/10-disable-default-plugins.conf | 9 ---- overlay.d/README.md | 5 --- tests/kola/data/commonlib.sh | 11 +++++ tests/kola/files/console-config | 2 +- tests/kola/kdump/crash/test.sh | 2 +- 16 files changed, 141 insertions(+), 131 deletions(-) delete mode 100644 overlay.d/14NetworkManager-plugins/statoverride delete mode 100644 overlay.d/14NetworkManager-plugins/usr/lib/NetworkManager/conf.d/10-disable-default-plugins.conf diff --git a/kola-denylist.yaml b/kola-denylist.yaml index 7ca29cf82c..942a279207 100644 --- a/kola-denylist.yaml +++ b/kola-denylist.yaml @@ -23,21 +23,11 @@ - s390x - pattern: ext.config.ignition.resource.remote tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1215 + snooze: 2022-10-27 arches: - s390x - pattern: rpmostree.install-uninstall tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1215 + snooze: 2022-10-27 arches: - s390x -- pattern: coreos.boot-mirror* - tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1282 - snooze: 2022-09-27 - streams: - - rawhide -- pattern: ext.config.clhm.network-device-info - tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1153 - snooze: 2022-10-04 - streams: - - testing-devel - - testing - - stable diff --git a/manifest-lock.aarch64.json b/manifest-lock.aarch64.json index c98f4b7355..d5c82917a5 100644 --- a/manifest-lock.aarch64.json +++ b/manifest-lock.aarch64.json @@ -19,7 +19,7 @@ "evra": "2.7.3.0-1.fc36.noarch" }, "aardvark-dns": { - "evra": "1.0.3-1.fc36.aarch64" + "evra": "1.1.0-1.fc36.aarch64" }, "acl": { "evra": "2.3.1-3.fc36.aarch64" @@ -58,19 +58,19 @@ "evra": "11-13.fc36.noarch" }, "bash": { - "evra": "5.1.16-2.fc36.aarch64" + "evra": "5.1.16-3.fc36.aarch64" }, "bash-completion": { "evra": "1:2.11-6.fc36.noarch" }, "bind-libs": { - "evra": "32:9.16.32-1.fc36.aarch64" + "evra": "32:9.16.33-1.fc36.aarch64" }, "bind-license": { - "evra": "32:9.16.32-1.fc36.noarch" + "evra": "32:9.16.33-1.fc36.noarch" }, "bind-utils": { - "evra": "32:9.16.32-1.fc36.aarch64" + "evra": "32:9.16.33-1.fc36.aarch64" }, "bootupd": { "evra": "0.2.6-2.fc36.aarch64" @@ -136,10 +136,10 @@ "evra": "0.21.3-1.fc36.noarch" }, "container-selinux": { - "evra": "2:2.188.0-1.fc36.noarch" + "evra": "2:2.190.0-1.fc36.noarch" }, "containerd": { - "evra": "1.6.8-2.fc36.aarch64" + "evra": "1.6.8-4.fc36.aarch64" }, "containernetworking-plugins": { "evra": "1.1.0-1.fc36.aarch64" @@ -340,7 +340,7 @@ "evra": "3.10.5-2.fc36.aarch64" }, "fwupd": { - "evra": "1.8.4-2.fc36.aarch64" + "evra": "1.8.5-1.fc36.aarch64" }, "gawk": { "evra": "5.1.1-2.fc36.aarch64" @@ -472,13 +472,13 @@ "evra": "2.4.0-9.fc36.noarch" }, "kernel": { - "evra": "5.19.9-200.fc36.aarch64" + "evra": "5.19.12-200.fc36.aarch64" }, "kernel-core": { - "evra": "5.19.9-200.fc36.aarch64" + "evra": "5.19.12-200.fc36.aarch64" }, "kernel-modules": { - "evra": "5.19.9-200.fc36.aarch64" + "evra": "5.19.12-200.fc36.aarch64" }, "kexec-tools": { "evra": "2.0.24-4.fc36.aarch64" @@ -892,7 +892,7 @@ "evra": "2.0-0.61.20160912git.fc36.aarch64" }, "netavark": { - "evra": "1.0.3-3.fc36.aarch64" + "evra": "1.1.0-1.fc36.aarch64" }, "nettle": { "evra": "3.8-1.fc36.aarch64" @@ -991,10 +991,10 @@ "evra": "1.8.0-2.fc36.aarch64" }, "podman": { - "evra": "4:4.2.0-2.fc36.aarch64" + "evra": "4:4.2.1-2.fc36.aarch64" }, "podman-plugins": { - "evra": "4:4.2.0-2.fc36.aarch64" + "evra": "4:4.2.1-2.fc36.aarch64" }, "policycoreutils": { "evra": "3.3-4.fc36.aarch64" @@ -1024,7 +1024,7 @@ "evra": "20210518-4.fc36.noarch" }, "qemu-user-static-x86": { - "evra": "2:6.2.0-14.fc36.aarch64" + "evra": "2:6.2.0-15.fc36.aarch64" }, "readline": { "evra": "8.1-6.fc36.aarch64" @@ -1066,10 +1066,10 @@ "evra": "4.8-10.fc36.aarch64" }, "selinux-policy": { - "evra": "36.14-1.fc36.noarch" + "evra": "36.15-1.fc36.noarch" }, "selinux-policy-targeted": { - "evra": "36.14-1.fc36.noarch" + "evra": "36.15-1.fc36.noarch" }, "setup": { "evra": "2.14.1-1.fc36.noarch" @@ -1222,10 +1222,10 @@ "evra": "2.1.0-18.fc36.aarch64" }, "zchunk-libs": { - "evra": "1.2.2-1.fc36.aarch64" + "evra": "1.2.3-1.fc36.aarch64" }, "zincati": { - "evra": "0.0.24-3.fc36.aarch64" + "evra": "0.0.24-4.fc36.aarch64" }, "zlib": { "evra": "1.2.11-33.fc36.aarch64" @@ -1238,16 +1238,16 @@ } }, "metadata": { - "generated": "2022-09-18T20:53:28Z", + "generated": "2022-10-01T16:08:43Z", "rpmmd_repos": { "fedora": { "generated": "2022-05-04T21:15:55Z" }, "fedora-coreos-pool": { - "generated": "2022-09-17T22:09:38Z" + "generated": "2022-09-30T22:58:40Z" }, "fedora-updates": { - "generated": "2022-09-18T01:08:01Z" + "generated": "2022-10-01T01:04:53Z" } } } diff --git a/manifest-lock.overrides.yaml b/manifest-lock.overrides.yaml index 838eb4c322..62cfbe5a1d 100644 --- a/manifest-lock.overrides.yaml +++ b/manifest-lock.overrides.yaml @@ -8,14 +8,4 @@ # in the `metadata.reason` key, though it's acceptable to omit a `reason` # for FCOS-specific packages (ignition, afterburn, etc.). -packages: - coreos-installer: - evr: 0.16.0-1.fc36 - metadata: - bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2022-90e83711b5 - type: fast-track - coreos-installer-bootinfra: - evr: 0.16.0-1.fc36 - metadata: - bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2022-90e83711b5 - type: fast-track +packages: {} diff --git a/manifest-lock.ppc64le.json b/manifest-lock.ppc64le.json index 0f43db317c..43e70bb430 100644 --- a/manifest-lock.ppc64le.json +++ b/manifest-lock.ppc64le.json @@ -19,7 +19,7 @@ "evra": "2.7.3.0-1.fc36.noarch" }, "aardvark-dns": { - "evra": "1.0.3-1.fc36.ppc64le" + "evra": "1.1.0-1.fc36.ppc64le" }, "acl": { "evra": "2.3.1-3.fc36.ppc64le" @@ -58,7 +58,7 @@ "evra": "11-13.fc36.noarch" }, "bash": { - "evra": "5.1.16-2.fc36.ppc64le" + "evra": "5.1.16-3.fc36.ppc64le" }, "bash-completion": { "evra": "1:2.11-6.fc36.noarch" @@ -67,13 +67,13 @@ "evra": "1.07.1-15.fc36.ppc64le" }, "bind-libs": { - "evra": "32:9.16.32-1.fc36.ppc64le" + "evra": "32:9.16.33-1.fc36.ppc64le" }, "bind-license": { - "evra": "32:9.16.32-1.fc36.noarch" + "evra": "32:9.16.33-1.fc36.noarch" }, "bind-utils": { - "evra": "32:9.16.32-1.fc36.ppc64le" + "evra": "32:9.16.33-1.fc36.ppc64le" }, "bsdtar": { "evra": "3.5.3-3.fc36.ppc64le" @@ -136,10 +136,10 @@ "evra": "0.21.3-1.fc36.noarch" }, "container-selinux": { - "evra": "2:2.188.0-1.fc36.noarch" + "evra": "2:2.190.0-1.fc36.noarch" }, "containerd": { - "evra": "1.6.8-2.fc36.ppc64le" + "evra": "1.6.8-4.fc36.ppc64le" }, "containernetworking-plugins": { "evra": "1.1.0-1.fc36.ppc64le" @@ -331,7 +331,7 @@ "evra": "3.10.5-2.fc36.ppc64le" }, "fwupd": { - "evra": "1.8.4-2.fc36.ppc64le" + "evra": "1.8.5-1.fc36.ppc64le" }, "gawk": { "evra": "5.1.1-2.fc36.ppc64le" @@ -466,13 +466,13 @@ "evra": "2.4.0-9.fc36.noarch" }, "kernel": { - "evra": "5.19.9-200.fc36.ppc64le" + "evra": "5.19.12-200.fc36.ppc64le" }, "kernel-core": { - "evra": "5.19.9-200.fc36.ppc64le" + "evra": "5.19.12-200.fc36.ppc64le" }, "kernel-modules": { - "evra": "5.19.9-200.fc36.ppc64le" + "evra": "5.19.12-200.fc36.ppc64le" }, "kexec-tools": { "evra": "2.0.24-4.fc36.ppc64le" @@ -889,7 +889,7 @@ "evra": "2.0-0.61.20160912git.fc36.ppc64le" }, "netavark": { - "evra": "1.0.3-3.fc36.ppc64le" + "evra": "1.1.0-1.fc36.ppc64le" }, "nettle": { "evra": "3.8-1.fc36.ppc64le" @@ -991,10 +991,10 @@ "evra": "1.8.0-2.fc36.ppc64le" }, "podman": { - "evra": "4:4.2.0-2.fc36.ppc64le" + "evra": "4:4.2.1-2.fc36.ppc64le" }, "podman-plugins": { - "evra": "4:4.2.0-2.fc36.ppc64le" + "evra": "4:4.2.1-2.fc36.ppc64le" }, "policycoreutils": { "evra": "3.3-4.fc36.ppc64le" @@ -1069,10 +1069,10 @@ "evra": "4.8-10.fc36.ppc64le" }, "selinux-policy": { - "evra": "36.14-1.fc36.noarch" + "evra": "36.15-1.fc36.noarch" }, "selinux-policy-targeted": { - "evra": "36.14-1.fc36.noarch" + "evra": "36.15-1.fc36.noarch" }, "servicelog": { "evra": "1.1.15-7.fc35.ppc64le" @@ -1225,10 +1225,10 @@ "evra": "2.1.0-18.fc36.ppc64le" }, "zchunk-libs": { - "evra": "1.2.2-1.fc36.ppc64le" + "evra": "1.2.3-1.fc36.ppc64le" }, "zincati": { - "evra": "0.0.24-3.fc36.ppc64le" + "evra": "0.0.24-4.fc36.ppc64le" }, "zlib": { "evra": "1.2.11-33.fc36.ppc64le" @@ -1241,16 +1241,16 @@ } }, "metadata": { - "generated": "2022-09-18T20:53:20Z", + "generated": "2022-10-01T16:08:41Z", "rpmmd_repos": { "fedora": { "generated": "2022-05-04T21:15:55Z" }, "fedora-coreos-pool": { - "generated": "2022-09-17T22:09:27Z" + "generated": "2022-09-30T23:00:11Z" }, "fedora-updates": { - "generated": "2022-09-18T01:08:18Z" + "generated": "2022-10-01T01:05:10Z" } } } diff --git a/manifest-lock.s390x.json b/manifest-lock.s390x.json index 1319b54bfb..ce422bfe71 100644 --- a/manifest-lock.s390x.json +++ b/manifest-lock.s390x.json @@ -19,7 +19,7 @@ "evra": "2.7.3.0-1.fc36.noarch" }, "aardvark-dns": { - "evra": "1.0.3-1.fc36.s390x" + "evra": "1.1.0-1.fc36.s390x" }, "acl": { "evra": "2.3.1-3.fc36.s390x" @@ -58,19 +58,19 @@ "evra": "11-13.fc36.noarch" }, "bash": { - "evra": "5.1.16-2.fc36.s390x" + "evra": "5.1.16-3.fc36.s390x" }, "bash-completion": { "evra": "1:2.11-6.fc36.noarch" }, "bind-libs": { - "evra": "32:9.16.32-1.fc36.s390x" + "evra": "32:9.16.33-1.fc36.s390x" }, "bind-license": { - "evra": "32:9.16.32-1.fc36.noarch" + "evra": "32:9.16.33-1.fc36.noarch" }, "bind-utils": { - "evra": "32:9.16.32-1.fc36.s390x" + "evra": "32:9.16.33-1.fc36.s390x" }, "bsdtar": { "evra": "3.5.3-3.fc36.s390x" @@ -133,10 +133,10 @@ "evra": "0.21.3-1.fc36.noarch" }, "container-selinux": { - "evra": "2:2.188.0-1.fc36.noarch" + "evra": "2:2.190.0-1.fc36.noarch" }, "containerd": { - "evra": "1.6.8-2.fc36.s390x" + "evra": "1.6.8-4.fc36.s390x" }, "containernetworking-plugins": { "evra": "1.1.0-1.fc36.s390x" @@ -436,13 +436,13 @@ "evra": "2.4.0-9.fc36.noarch" }, "kernel": { - "evra": "5.19.9-200.fc36.s390x" + "evra": "5.19.12-200.fc36.s390x" }, "kernel-core": { - "evra": "5.19.9-200.fc36.s390x" + "evra": "5.19.12-200.fc36.s390x" }, "kernel-modules": { - "evra": "5.19.9-200.fc36.s390x" + "evra": "5.19.12-200.fc36.s390x" }, "kexec-tools": { "evra": "2.0.24-4.fc36.s390x" @@ -835,7 +835,7 @@ "evra": "2.0-0.61.20160912git.fc36.s390x" }, "netavark": { - "evra": "1.0.3-3.fc36.s390x" + "evra": "1.1.0-1.fc36.s390x" }, "nettle": { "evra": "3.8-1.fc36.s390x" @@ -928,10 +928,10 @@ "evra": "1.8.0-2.fc36.s390x" }, "podman": { - "evra": "4:4.2.0-2.fc36.s390x" + "evra": "4:4.2.1-2.fc36.s390x" }, "podman-plugins": { - "evra": "4:4.2.0-2.fc36.s390x" + "evra": "4:4.2.1-2.fc36.s390x" }, "policycoreutils": { "evra": "3.3-4.fc36.s390x" @@ -961,7 +961,7 @@ "evra": "20210518-4.fc36.noarch" }, "qemu-user-static-x86": { - "evra": "2:6.2.0-14.fc36.s390x" + "evra": "2:6.2.0-15.fc36.s390x" }, "readline": { "evra": "8.1-6.fc36.s390x" @@ -1006,10 +1006,10 @@ "evra": "4.8-10.fc36.s390x" }, "selinux-policy": { - "evra": "36.14-1.fc36.noarch" + "evra": "36.15-1.fc36.noarch" }, "selinux-policy-targeted": { - "evra": "36.14-1.fc36.noarch" + "evra": "36.15-1.fc36.noarch" }, "setup": { "evra": "2.14.1-1.fc36.noarch" @@ -1159,10 +1159,10 @@ "evra": "2.1.0-18.fc36.s390x" }, "zchunk-libs": { - "evra": "1.2.2-1.fc36.s390x" + "evra": "1.2.3-1.fc36.s390x" }, "zincati": { - "evra": "0.0.24-3.fc36.s390x" + "evra": "0.0.24-4.fc36.s390x" }, "zlib": { "evra": "1.2.11-33.fc36.s390x" @@ -1175,16 +1175,16 @@ } }, "metadata": { - "generated": "2022-09-18T20:54:16Z", + "generated": "2022-10-01T16:07:58Z", "rpmmd_repos": { "fedora": { "generated": "2022-05-04T21:15:53Z" }, "fedora-coreos-pool": { - "generated": "2022-09-17T22:09:51Z" + "generated": "2022-09-30T22:58:10Z" }, "fedora-updates": { - "generated": "2022-09-18T01:08:28Z" + "generated": "2022-10-01T01:05:18Z" } } } diff --git a/manifest-lock.x86_64.json b/manifest-lock.x86_64.json index 5d14f514bd..fa9e001729 100644 --- a/manifest-lock.x86_64.json +++ b/manifest-lock.x86_64.json @@ -19,7 +19,7 @@ "evra": "2.7.3.0-1.fc36.noarch" }, "aardvark-dns": { - "evra": "1.0.3-1.fc36.x86_64" + "evra": "1.1.0-1.fc36.x86_64" }, "acl": { "evra": "2.3.1-3.fc36.x86_64" @@ -58,19 +58,19 @@ "evra": "11-13.fc36.noarch" }, "bash": { - "evra": "5.1.16-2.fc36.x86_64" + "evra": "5.1.16-3.fc36.x86_64" }, "bash-completion": { "evra": "1:2.11-6.fc36.noarch" }, "bind-libs": { - "evra": "32:9.16.32-1.fc36.x86_64" + "evra": "32:9.16.33-1.fc36.x86_64" }, "bind-license": { - "evra": "32:9.16.32-1.fc36.noarch" + "evra": "32:9.16.33-1.fc36.noarch" }, "bind-utils": { - "evra": "32:9.16.32-1.fc36.x86_64" + "evra": "32:9.16.33-1.fc36.x86_64" }, "bootupd": { "evra": "0.2.6-2.fc36.x86_64" @@ -136,10 +136,10 @@ "evra": "0.21.3-1.fc36.noarch" }, "container-selinux": { - "evra": "2:2.188.0-1.fc36.noarch" + "evra": "2:2.190.0-1.fc36.noarch" }, "containerd": { - "evra": "1.6.8-2.fc36.x86_64" + "evra": "1.6.8-4.fc36.x86_64" }, "containernetworking-plugins": { "evra": "1.1.0-1.fc36.x86_64" @@ -340,7 +340,7 @@ "evra": "3.10.5-2.fc36.x86_64" }, "fwupd": { - "evra": "1.8.4-2.fc36.x86_64" + "evra": "1.8.5-1.fc36.x86_64" }, "gawk": { "evra": "5.1.1-2.fc36.x86_64" @@ -478,13 +478,13 @@ "evra": "2.4.0-9.fc36.noarch" }, "kernel": { - "evra": "5.19.9-200.fc36.x86_64" + "evra": "5.19.12-200.fc36.x86_64" }, "kernel-core": { - "evra": "5.19.9-200.fc36.x86_64" + "evra": "5.19.12-200.fc36.x86_64" }, "kernel-modules": { - "evra": "5.19.9-200.fc36.x86_64" + "evra": "5.19.12-200.fc36.x86_64" }, "kexec-tools": { "evra": "2.0.24-4.fc36.x86_64" @@ -904,7 +904,7 @@ "evra": "2.0-0.61.20160912git.fc36.x86_64" }, "netavark": { - "evra": "1.0.3-3.fc36.x86_64" + "evra": "1.1.0-1.fc36.x86_64" }, "nettle": { "evra": "3.8-1.fc36.x86_64" @@ -1003,10 +1003,10 @@ "evra": "1.8.0-2.fc36.x86_64" }, "podman": { - "evra": "4:4.2.0-2.fc36.x86_64" + "evra": "4:4.2.1-2.fc36.x86_64" }, "podman-plugins": { - "evra": "4:4.2.0-2.fc36.x86_64" + "evra": "4:4.2.1-2.fc36.x86_64" }, "policycoreutils": { "evra": "3.3-4.fc36.x86_64" @@ -1075,10 +1075,10 @@ "evra": "4.8-10.fc36.x86_64" }, "selinux-policy": { - "evra": "36.14-1.fc36.noarch" + "evra": "36.15-1.fc36.noarch" }, "selinux-policy-targeted": { - "evra": "36.14-1.fc36.noarch" + "evra": "36.15-1.fc36.noarch" }, "setup": { "evra": "2.14.1-1.fc36.noarch" @@ -1231,10 +1231,10 @@ "evra": "2.1.0-18.fc36.x86_64" }, "zchunk-libs": { - "evra": "1.2.2-1.fc36.x86_64" + "evra": "1.2.3-1.fc36.x86_64" }, "zincati": { - "evra": "0.0.24-3.fc36.x86_64" + "evra": "0.0.24-4.fc36.x86_64" }, "zlib": { "evra": "1.2.11-33.fc36.x86_64" @@ -1247,16 +1247,16 @@ } }, "metadata": { - "generated": "2022-09-18T20:52:45Z", + "generated": "2022-10-01T16:07:56Z", "rpmmd_repos": { "fedora": { "generated": "2022-05-04T21:16:11Z" }, "fedora-coreos-pool": { - "generated": "2022-09-17T22:11:15Z" + "generated": "2022-09-30T22:59:59Z" }, "fedora-updates": { - "generated": "2022-09-18T01:08:36Z" + "generated": "2022-10-01T01:05:27Z" } } } diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml index ba39393294..5f428b1858 100644 --- a/manifests/fedora-coreos-base.yaml +++ b/manifests/fedora-coreos-base.yaml @@ -19,7 +19,6 @@ ostree-layers: - overlay/05core - overlay/08nouveau - overlay/09misc - - overlay/14NetworkManager-plugins - overlay/20platform-chrony # Be minimal diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml index ed3eac3c47..bc2d203551 100644 --- a/manifests/fedora-coreos.yaml +++ b/manifests/fedora-coreos.yaml @@ -134,9 +134,6 @@ postprocess: remove-from-packages: - # Drop NetworkManager support for ifcfg files, see also corresponding - # overlay.d/14NetworkManager-plugins - - [NetworkManager, /usr/lib64/NetworkManager/.*/libnm-settings-plugin-ifcfg-rh.so] # Drop some buggy sysusers fragments which do not match static IDs allocation: # https://bugzilla.redhat.com/show_bug.cgi?id=2105177 - [dbus-common, /usr/lib/sysusers.d/dbus.conf] @@ -169,3 +166,6 @@ exclude-packages: # For (datacenter/cloud oriented) servers, we want to see the details by default. # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/HSMISZ3ETWQ4ETVLWZQJ55ARZT27AAV3/ - plymouth + # Do not use legacy ifcfg config format in NetworkManager + # See https://github.com/coreos/fedora-coreos-config/pull/1991 + - NetworkManager-initscripts-ifcfg-rh diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-live/coreos-liveiso-persist-osmet.service b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-live/coreos-liveiso-persist-osmet.service index 95684102df..ea82d77430 100644 --- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-live/coreos-liveiso-persist-osmet.service +++ b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-live/coreos-liveiso-persist-osmet.service @@ -4,6 +4,8 @@ DefaultDependencies=false ConditionPathExists=/run/ostree-live ConditionKernelCommandLine=coreos.liveiso RequiresMountsFor=/run/media/iso +# on el8, the ISO is mounted by our own systemd unit +After=run-media-iso-mount.service Before=initrd-switch-root.target [Service] diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-live/live-generator b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-live/live-generator index a755aa3625..dfca3469b7 100755 --- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-live/live-generator +++ b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-live/live-generator @@ -51,6 +51,12 @@ ExecStartPost=/usr/sbin/ostree-cmdline stop EOF isoroot=$(getarg coreos.liveiso= ||:) +is_rhcos8() { + # Unfortunately we can't rely on /etc/os-release since el8 doesn't seem to + # have https://github.com/dracutdevs/dracut/pull/655. + [[ "${isoroot}" == rhcos-* ]] && [[ $(uname -r) == *.el8* ]] +} + if [ -z "${isoroot}" ]; then # In this case, the rootfs is already unpacked into the initrd, or we need # to retrieve it @@ -81,7 +87,32 @@ else After=${isosrc_escaped} Requires=${isosrc_escaped} EOF - cat >"${UNIT_DIR}/run-media-iso.mount" <"${UNIT_DIR}/run-media-iso-mount.service" <"${UNIT_DIR}/run-media-iso.mount" <"${UNIT_DIR}/sysroot.mount" < diff --git a/overlay.d/14NetworkManager-plugins/usr/lib/NetworkManager/conf.d/10-disable-default-plugins.conf b/overlay.d/14NetworkManager-plugins/usr/lib/NetworkManager/conf.d/10-disable-default-plugins.conf deleted file mode 100644 index cabc5bb7f1..0000000000 --- a/overlay.d/14NetworkManager-plugins/usr/lib/NetworkManager/conf.d/10-disable-default-plugins.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Stop NetworkManager from trying to load the ifcfg-rh plugin by default, -# which we don't ship. This actually disables all default plugins, of which -# ifcfg-rh is currently the only one. -# -# Note that we must do this for now because `-=` syntax doesn't work -# with compiled-in defaults. Proposed upstream fix: -# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/491 -[main] -plugins= diff --git a/overlay.d/README.md b/overlay.d/README.md index f57d9e9e57..ece8485284 100644 --- a/overlay.d/README.md +++ b/overlay.d/README.md @@ -28,11 +28,6 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1700056 Warning about `/etc/sysconfig`. -14NetworkManager-plugins ------------------------- - -Disables the Red Hat Linux legacy `ifcfg` format. - 15fcos ------ diff --git a/tests/kola/data/commonlib.sh b/tests/kola/data/commonlib.sh index c9d2fc1bbe..09f5b4e941 100644 --- a/tests/kola/data/commonlib.sh +++ b/tests/kola/data/commonlib.sh @@ -71,3 +71,14 @@ cmdline_arg() { done echo "${value}" } + +# wait for 20s when in activating status +is_service_active() { + local service="$1" + for x in {0..20}; do + [ $(systemctl is-active "${service}") != "activating" ] && break + sleep 1 + done + # return actual result + systemctl is-active "${service}" +} diff --git a/tests/kola/files/console-config b/tests/kola/files/console-config index 08fce3450e..9460ac417e 100755 --- a/tests/kola/files/console-config +++ b/tests/kola/files/console-config @@ -41,7 +41,7 @@ if is_fcos; then # Schedule based on: # https://lists.fedoraproject.org/archives/list/coreos-status@lists.fedoraproject.org/message/GHLXX4MXNHUEAXQLK6BZN45IQYHRVQB4/ case "$(get_fcos_stream)" in - next-devel) threshold=20220923 ;; + next-devel) threshold=20220919 ;; next) threshold=20220930 ;; testing-devel|rawhide|branched) threshold=20221118 ;; testing) threshold=20221125 ;; diff --git a/tests/kola/kdump/crash/test.sh b/tests/kola/kdump/crash/test.sh index d3e90201e9..02406e59a4 100755 --- a/tests/kola/kdump/crash/test.sh +++ b/tests/kola/kdump/crash/test.sh @@ -16,7 +16,7 @@ set -xeuo pipefail case "${AUTOPKGTEST_REBOOT_MARK:-}" in "") - if [ $(systemctl show -p Result kdump.service) != "Result=success" ]; then + if ! is_service_active kdump.service; then fatal "kdump.service failed to start" fi # Verify that the crashkernel reserved memory is large enough