From 57b3520ab1cefaab9b872d0f2f8dce04668dfbff Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Tue, 2 Mar 2021 11:24:10 -0500
Subject: [PATCH] Revert "kola: Add --no-default-checks"

This reverts commit 0d07f4e76506363c8df44f31a577bee2acaad088.

This switch doesn't work. It relies on `getClusterSemver()` getting
called, which we don't do by default in FCOS.
---
 mantle/cmd/kola/options.go  | 1 -
 mantle/kola/harness.go      | 9 +++------
 mantle/platform/platform.go | 3 +--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/mantle/cmd/kola/options.go b/mantle/cmd/kola/options.go
index a90c8f5747..9d7584a33b 100644
--- a/mantle/cmd/kola/options.go
+++ b/mantle/cmd/kola/options.go
@@ -63,7 +63,6 @@ func init() {
 	bv(&kola.NoNet, "no-net", false, "Don't run tests that require an Internet connection")
 	ssv(&kola.Tags, "tag", []string{}, "Test tag to run. Can be specified multiple times.")
 	bv(&kola.Options.SSHOnTestFailure, "ssh-on-test-failure", false, "SSH into a machine when tests fail")
-	bv(&kola.Options.SuppressDefaultChecks, "no-default-checks", false, "Disable default checks for failed systemd units and SELinux AVC denials")
 	sv(&kola.Options.Stream, "stream", "", "CoreOS stream ID (e.g. for Fedora CoreOS: stable, testing, next)")
 	sv(&kola.Options.CosaWorkdir, "workdir", "", "coreos-assembler working directory")
 	sv(&kola.Options.CosaBuildId, "build", "", "coreos-assembler build ID")
diff --git a/mantle/kola/harness.go b/mantle/kola/harness.go
index c74494136d..27d6b0c7d4 100644
--- a/mantle/kola/harness.go
+++ b/mantle/kola/harness.go
@@ -883,12 +883,9 @@ func getClusterSemver(flight platform.Flight, outputDir string) (*semver.Version
 		return nil, err
 	}
 
-	cfg := &platform.RuntimeConfig{
-		OutputDir:        testDir,
-		AllowFailedUnits: Options.SuppressDefaultChecks,
-	}
-
-	cluster, err := flight.NewCluster(cfg)
+	cluster, err := flight.NewCluster(&platform.RuntimeConfig{
+		OutputDir: testDir,
+	})
 	if err != nil {
 		return nil, errors.Wrapf(err, "creating cluster for semver check")
 	}
diff --git a/mantle/platform/platform.go b/mantle/platform/platform.go
index 5423201bfd..9bd77c3508 100644
--- a/mantle/platform/platform.go
+++ b/mantle/platform/platform.go
@@ -185,8 +185,7 @@ type Options struct {
 	// inside of RenderUserData
 	OSContainer string
 
-	SSHOnTestFailure      bool
-	SuppressDefaultChecks bool
+	SSHOnTestFailure bool
 }
 
 // RuntimeConfig contains cluster-specific configuration.