From 8a5cfb6b78c76d66b61d70dfca24c4964a8fdddd Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 22 Oct 2023 10:28:08 -0400 Subject: [PATCH 1/2] kola: Use centralized drop-in to disable zincati Just a drive by cleanup. --- mantle/platform/cluster.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mantle/platform/cluster.go b/mantle/platform/cluster.go index 56c0aee8fe..97cce8747f 100644 --- a/mantle/platform/cluster.go +++ b/mantle/platform/cluster.go @@ -269,8 +269,7 @@ func (bc *BaseCluster) RenderUserData(userdata *platformConf.UserData, ignitionV // disable Zincati by default if bc.Distribution() == "fcos" { - conf.AddFile("/etc/zincati/config.d/90-disable-auto-updates.toml", `[updates] -enabled = false`, 0644) + conf.DisableAutomaticUpdates() } if bc.bf.baseopts.OSContainer != "" { From aa3dabe1bc048c8efb40741926b3e70f33ac1691 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 22 Oct 2023 10:30:24 -0400 Subject: [PATCH 2/2] kola: Explicitly mask zincati The newer zincati errors out instead of retrying; mask it explicitly. --- mantle/platform/cluster.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mantle/platform/cluster.go b/mantle/platform/cluster.go index 97cce8747f..51e804a762 100644 --- a/mantle/platform/cluster.go +++ b/mantle/platform/cluster.go @@ -282,6 +282,8 @@ After=network-online.target [Service] Type=oneshot +# Newer zincati more explicitly fails on containers; fully disable it +ExecStart=systemctl mask --now zincati ExecStart=rpm-ostree rebase --experimental %s ExecStart=touch /etc/kola-rebase-done ExecStart=systemctl reboot