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

Author: yasminvalim

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"

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(&register.Test{
 		Name:          "basic.uefi",
@@ -69,6 +71,7 @@ func init() {
 		MachineOptions: platform.MachineOptions{
 			Firmware: uefi,
 		},
+		Tags: []string{kola.BootcBaseTag},
 	})
 	register.RegisterTest(&register.Test{
 		Name:          "basic.uefi-secure",
@@ -81,6 +84,7 @@ func init() {
 		MachineOptions: platform.MachineOptions{
 			Firmware: uefiSecure,
 		},
+		Tags: []string{kola.BootcBaseTag},
 	})
 	register.RegisterTest(&register.Test{
 		Name:        "basic.nvme",
@@ -95,6 +99,7 @@ func init() {
 		MachineOptions: platform.MachineOptions{
 			Nvme: true,
 		},
+		Tags: []string{kola.BootcBaseTag},
 	})
 	register.RegisterTest(&register.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(&register.Test{
 		Name:        "rhcos.services-disabled",
@@ -116,6 +122,7 @@ func init() {
 			"ServicesDisabled": register.CreateNativeFuncWrap(TestServicesDisabledRHCOS),
 		},
 		Distros: []string{"rhcos"},
+		Tags:    []string{kola.BootcBaseTag},
 	})
 }
 

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},
 	})
 }
 

mantle/kola/tests/ostree/unlock.go

@@ -31,15 +31,15 @@ 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(&register.Test{
 		Run:         ostreeHotfixTest,
 		ClusterSize: 1,
 		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
 	})
 }
 

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(&register.Test{
 		Run:         rpmOstreeInstallUninstall,