Skip to content

test: provide a way to skip tests on disconnected clusters #26019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Apr 6, 2021
Merged

test: provide a way to skip tests on disconnected clusters #26019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 33 additions & 29 deletions cmd/openshift-tests/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,17 @@ func initializeTestFramework(context *e2e.TestContextType, config *exutilcloud.C
}

func getProviderMatchFn(config *exutilcloud.ClusterConfiguration) TestNameMatchesFunc {
// given the configuration we have loaded, skip tests that our provider should exclude
// given the configuration we have loaded, skip tests that our provider, disconnected status,
// or our network plugin should exclude
var skips []string
skips = append(skips, fmt.Sprintf("[Skipped:%s]", config.ProviderName))
for _, id := range config.NetworkPluginIDs {
skips = append(skips, fmt.Sprintf("[Skipped:Network/%s]", id))
}
if config.Disconnected {
skips = append(skips, "[Skipped:Disconnected]")
}

matchFn := func(name string) bool {
for _, skip := range skips {
if strings.Contains(name, skip) {
Expand Down Expand Up @@ -117,20 +121,19 @@ func decodeProvider(provider string, dryRun, discover bool) (*exutilcloud.Cluste
return config, nil

default:
var providerInfo struct{ Type string }
var providerInfo struct {
Type string
Disconnected bool
e2e.CloudConfig `json:",inline"`
}
if err := json.Unmarshal([]byte(provider), &providerInfo); err != nil {
return nil, fmt.Errorf("provider must be a JSON object with the 'type' key at a minimum: %v", err)
return nil, fmt.Errorf("provider must be a JSON object with the 'type' key at a minimum, and decode into a cloud config object: %v", err)
}
if len(providerInfo.Type) == 0 {
return nil, fmt.Errorf("provider must be a JSON object with the 'type' key")
}
var cloudConfig e2e.CloudConfig
if err := json.Unmarshal([]byte(provider), &cloudConfig); err != nil {
return nil, fmt.Errorf("provider must decode into the cloud config object: %v", err)
}

// attempt to load the default config, then overwrite with any values from the passed
// object that can be overriden
// object that can be overridden
var config *exutilcloud.ClusterConfiguration
if discover {
if clientConfig, err := e2e.LoadConfig(true); err == nil {
Expand All @@ -140,36 +143,37 @@ func decodeProvider(provider string, dryRun, discover bool) (*exutilcloud.Cluste
if config == nil {
config = &exutilcloud.ClusterConfiguration{
ProviderName: providerInfo.Type,
ProjectID: cloudConfig.ProjectID,
Region: cloudConfig.Region,
Zone: cloudConfig.Zone,
Zones: cloudConfig.Zones,
NumNodes: cloudConfig.NumNodes,
MultiMaster: cloudConfig.MultiMaster,
MultiZone: cloudConfig.MultiZone,
ConfigFile: cloudConfig.ConfigFile,
ProjectID: providerInfo.ProjectID,
Region: providerInfo.Region,
Zone: providerInfo.Zone,
Zones: providerInfo.Zones,
NumNodes: providerInfo.NumNodes,
MultiMaster: providerInfo.MultiMaster,
MultiZone: providerInfo.MultiZone,
ConfigFile: providerInfo.ConfigFile,
}
} else {
config.ProviderName = providerInfo.Type
if len(cloudConfig.ProjectID) > 0 {
config.ProjectID = cloudConfig.ProjectID
if len(providerInfo.ProjectID) > 0 {
config.ProjectID = providerInfo.ProjectID
}
if len(cloudConfig.Region) > 0 {
config.Region = cloudConfig.Region
if len(providerInfo.Region) > 0 {
config.Region = providerInfo.Region
}
if len(cloudConfig.Zone) > 0 {
config.Zone = cloudConfig.Zone
if len(providerInfo.Zone) > 0 {
config.Zone = providerInfo.Zone
}
if len(cloudConfig.Zones) > 0 {
config.Zones = cloudConfig.Zones
if len(providerInfo.Zones) > 0 {
config.Zones = providerInfo.Zones
}
if len(cloudConfig.ConfigFile) > 0 {
config.ConfigFile = cloudConfig.ConfigFile
if len(providerInfo.ConfigFile) > 0 {
config.ConfigFile = providerInfo.ConfigFile
}
if cloudConfig.NumNodes > 0 {
config.NumNodes = cloudConfig.NumNodes
if providerInfo.NumNodes > 0 {
config.NumNodes = providerInfo.NumNodes
}
}
config.Disconnected = providerInfo.Disconnected
return config, nil
}
}
Loading