From 939a264bb06f75f6dbead22c0dd88753ee922687 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Thu, 15 Apr 2021 11:35:31 +0200 Subject: [PATCH] upgrade: register none suite Previously skip rules for None suite (no additional tests to run during upgrade) were added. This commits ensures "none" suite is properly declared --- cmd/openshift-tests/upgrade.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cmd/openshift-tests/upgrade.go b/cmd/openshift-tests/upgrade.go index 89e429b62ba2..472d3e11f3ed 100644 --- a/cmd/openshift-tests/upgrade.go +++ b/cmd/openshift-tests/upgrade.go @@ -52,6 +52,23 @@ var upgradeSuites = testSuites{ }, PreSuite: upgradeTestPreSuite, }, + { + TestSuite: ginkgo.TestSuite{ + Name: "none", + Description: templates.LongDesc(` + Don't run disruption tests. + `), + Matches: func(name string) bool { + if isStandardEarlyTest(name) { + return true + } + return strings.Contains(name, "[Feature:ClusterUpgrade]") && !strings.Contains(name, "[Suite:k8s]") + }, + TestTimeout: 240 * time.Minute, + SyntheticEventTests: ginkgo.JUnitForEventsFunc(synthetictests.SystemUpgradeEventInvariants), + }, + PreSuite: upgradeTestPreSuite, + }, } // upgradeTestPreSuite validates the test options.