From 6b434804aaa4183062b9daa085b5fcb531098485 Mon Sep 17 00:00:00 2001 From: Yasmin de Souza Date: Tue, 7 Apr 2026 16:54:14 -0300 Subject: [PATCH] Add a bootc-base tag and kola.BootcBaseTag for Kola tests that do not set UserData.docs. Tag the agreed core, ostree, and rpm-ostree upgrade-rollback tests so we can select them without custom Ignition --- mantle/kola/harness.go | 4 ++++ mantle/kola/tests/coretest/core.go | 7 +++++++ mantle/kola/tests/ostree/sync.go | 2 +- mantle/kola/tests/ostree/unlock.go | 4 ++-- mantle/kola/tests/rpmostree/deployments.go | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/mantle/kola/harness.go b/mantle/kola/harness.go index 48303c008b..9ac227a12c 100644 --- a/mantle/kola/harness.go +++ b/mantle/kola/harness.go @@ -80,6 +80,10 @@ const InstalledTestDefaultTest = "test.sh" // Specifying this in the tags list is required to denote a need for Internet access const NeedsInternetTag = "needs-internet" +// BootcBaseTag marks tests with no test-specific Ignition/Butane (no register.Test.UserData). +// They are intended to run when SSH is provisioned without custom Ignition (e.g. systemd/SMBIOS). +const BootcBaseTag = "bootc-base" + // PlatformIndependentTag is currently equivalent to platform: qemu, but that may change in the future. // For more, see the doc in external-tests.md. const PlatformIndependentTag = "platform-independent" diff --git a/mantle/kola/tests/coretest/core.go b/mantle/kola/tests/coretest/core.go index 2d8a3592cf..9d90dd0ded 100644 --- a/mantle/kola/tests/coretest/core.go +++ b/mantle/kola/tests/coretest/core.go @@ -11,6 +11,7 @@ import ( "github.com/pborman/uuid" + "github.com/coreos/coreos-assembler/mantle/kola" "github.com/coreos/coreos-assembler/mantle/kola/register" "github.com/coreos/coreos-assembler/mantle/platform" ) @@ -57,6 +58,7 @@ func init() { Run: LocalTests, ClusterSize: 1, NativeFuncs: nativeFuncs, + Tags: []string{kola.BootcBaseTag}, }) register.RegisterTest(®ister.Test{ Name: "basic.uefi", @@ -69,6 +71,7 @@ func init() { MachineOptions: platform.MachineOptions{ Firmware: uefi, }, + Tags: []string{kola.BootcBaseTag}, }) register.RegisterTest(®ister.Test{ Name: "basic.uefi-secure", @@ -81,6 +84,7 @@ func init() { MachineOptions: platform.MachineOptions{ Firmware: uefiSecure, }, + Tags: []string{kola.BootcBaseTag}, }) register.RegisterTest(®ister.Test{ Name: "basic.nvme", @@ -95,6 +99,7 @@ func init() { MachineOptions: platform.MachineOptions{ Nvme: true, }, + Tags: []string{kola.BootcBaseTag}, }) register.RegisterTest(®ister.Test{ Name: "rootfs.uuid", @@ -106,6 +111,7 @@ func init() { }, // FIXME run on RHCOS once it has https://github.com/coreos/ignition-dracut/pull/93 Distros: []string{"fcos"}, + Tags: []string{kola.BootcBaseTag}, }) register.RegisterTest(®ister.Test{ Name: "rhcos.services-disabled", @@ -116,6 +122,7 @@ func init() { "ServicesDisabled": register.CreateNativeFuncWrap(TestServicesDisabledRHCOS), }, Distros: []string{"rhcos"}, + Tags: []string{kola.BootcBaseTag}, }) } diff --git a/mantle/kola/tests/ostree/sync.go b/mantle/kola/tests/ostree/sync.go index 085afb9fa6..a1d8309536 100644 --- a/mantle/kola/tests/ostree/sync.go +++ b/mantle/kola/tests/ostree/sync.go @@ -81,7 +81,7 @@ func init() { Name: "ostree.sync", Description: "Verify ostree can sync the filesystem with disconnected the NFS volume.", Distros: []string{"rhcos"}, - Tags: []string{"ostree", kola.SkipBaseChecksTag, kola.NeedsInternetTag, "reprovision"}, + Tags: []string{"ostree", kola.SkipBaseChecksTag, kola.NeedsInternetTag, "reprovision", kola.BootcBaseTag}, }) } diff --git a/mantle/kola/tests/ostree/unlock.go b/mantle/kola/tests/ostree/unlock.go index d8b7ac9e73..aa98df389b 100644 --- a/mantle/kola/tests/ostree/unlock.go +++ b/mantle/kola/tests/ostree/unlock.go @@ -31,7 +31,7 @@ func init() { Name: "ostree.unlock", Description: "Verify installing an rpm does not persist when using `ostree admin unlock`.", FailFast: true, - Tags: []string{"ostree", kola.NeedsInternetTag}, // need network to pull RPM + Tags: []string{"ostree", kola.NeedsInternetTag, kola.BootcBaseTag}, // need network to pull RPM }) register.RegisterTest(®ister.Test{ Run: ostreeHotfixTest, @@ -39,7 +39,7 @@ func init() { Name: "ostree.hotfix", Description: "Verify that the deployment can be put into hotfix mode where RPMs installed with persist across reboots.", FailFast: true, - Tags: []string{"ostree", kola.NeedsInternetTag}, // need network to pull RPM + Tags: []string{"ostree", kola.NeedsInternetTag, kola.BootcBaseTag}, // need network to pull RPM }) } diff --git a/mantle/kola/tests/rpmostree/deployments.go b/mantle/kola/tests/rpmostree/deployments.go index c9442d5867..0c940ff5eb 100644 --- a/mantle/kola/tests/rpmostree/deployments.go +++ b/mantle/kola/tests/rpmostree/deployments.go @@ -33,7 +33,7 @@ func init() { Name: "rpmostree.upgrade-rollback", Description: "Verify an upgrade and rollback with a simulated update works.", FailFast: true, - Tags: []string{"rpm-ostree", "upgrade"}, + Tags: []string{"rpm-ostree", "upgrade", kola.BootcBaseTag}, }) register.RegisterTest(®ister.Test{ Run: rpmOstreeInstallUninstall,