From 1f2204750799f2d08ffe4eaa38b918c12d3de4f1 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Mon, 12 Apr 2021 17:40:54 +0200 Subject: [PATCH] upgrade: add "none" suite which skip disruption tests "none" suite is an empty set of tests. These would be handy in the following usecases: a) paused worker tests could skip disruption tests until final version is reached b) SNO upgrade tests are providing HA for the components, so distruption tests would permafail --- cmd/openshift-tests/upgrade.go | 2 ++ test/e2e/upgrade/upgrade.go | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/cmd/openshift-tests/upgrade.go b/cmd/openshift-tests/upgrade.go index 98f6645b78cb..89e429b62ba2 100644 --- a/cmd/openshift-tests/upgrade.go +++ b/cmd/openshift-tests/upgrade.go @@ -77,6 +77,8 @@ func upgradeTestPreTest() error { parseUpgradeOptions(opt.TestOptions) upgrade.SetToImage(opt.ToImage) switch opt.Suite { + case "none": + return filterUpgrade(upgrade.NoTests(), func(string) bool { return true }) case "platform": return filterUpgrade(upgrade.AllTests(), func(name string) bool { return name == controlplane.NewKubeAvailableWithNewConnectionsTest().Name() || name == controlplane.NewKubeAvailableWithNewConnectionsTest().Name() diff --git a/test/e2e/upgrade/upgrade.go b/test/e2e/upgrade/upgrade.go index 32e1822057a7..0c08098ef24c 100644 --- a/test/e2e/upgrade/upgrade.go +++ b/test/e2e/upgrade/upgrade.go @@ -38,6 +38,12 @@ import ( "github.com/openshift/origin/test/extended/util/operator" ) +// NoTests is an empty list of tests +func NoTests() []upgrades.Test { + return []upgrades.Test{} +} + +// AllTests includes all tests (minimal + disruption) func AllTests() []upgrades.Test { return []upgrades.Test{ controlplane.NewKubeAvailableWithNewConnectionsTest(),