Skip to content

Commit

Permalink
Revert "kola: Add --no-default-checks"
Browse files Browse the repository at this point in the history
This reverts commit 0d07f4e.

This switch doesn't work. It relies on `getClusterSemver()` getting
called, which we don't do by default in FCOS.
  • Loading branch information
jlebon authored and openshift-merge-robot committed Mar 2, 2021
1 parent 460ee79 commit 57b3520
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
1 change: 0 additions & 1 deletion mantle/cmd/kola/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
9 changes: 3 additions & 6 deletions mantle/kola/harness.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
3 changes: 1 addition & 2 deletions mantle/platform/platform.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,7 @@ type Options struct {
// inside of RenderUserData
OSContainer string

SSHOnTestFailure bool
SuppressDefaultChecks bool
SSHOnTestFailure bool
}

// RuntimeConfig contains cluster-specific configuration.
Expand Down

0 comments on commit 57b3520

Please sign in to comment.