kola: distinguish between scos and rhocs distros

Despite SCOS and RHCOS being largely similar, certain features
(such as s390x Secure Execution and LUKS-CEX) are only supported
on RHCOS. It does not make sense to run RHCOS-only tests on SCOS.

Author: nikita-dubrovskii

mantle/cmd/kola/options.go

@@ -370,9 +370,6 @@ func syncOptionsImpl(useCosa bool) error {
 
 	if kola.Options.Distribution == "" {
 		kola.Options.Distribution = kolaDistros[0]
-	} else if kola.Options.Distribution == "scos" {
-		// Consider SCOS the same as RHCOS for now
-		kola.Options.Distribution = "rhcos"
 	} else if err := validateOption("distro", kola.Options.Distribution, kolaDistros); err != nil {
 		return err
 	}

mantle/util/distros.go

@@ -23,10 +23,8 @@ import (
 // TargetDistro returns the distribution of a cosa build
 func TargetDistro(build *builds.Build) (string, error) {
 	switch build.Name {
-	case "rhcos":
-		return "rhcos", nil
-	case "scos":
-		return "rhcos", nil
+	case "rhcos", "scos":
+		return build.Name, nil
 	case "fedora-coreos":
 		return "fcos", nil
 	default: