diff --git a/test/e2e/features/story_microshift.feature b/test/e2e/features/story_microshift.feature index 54a6b45aaa..03c51e2dbc 100644 --- a/test/e2e/features/story_microshift.feature +++ b/test/e2e/features/story_microshift.feature @@ -3,12 +3,10 @@ Feature: Microshift test stories Background: Given setting config property "preset" to value "microshift" succeeds - And ensuring network mode user And executing single crc setup command succeeds And starting CRC with default bundle succeeds And ensuring oc command is available And ensuring microshift cluster is fully operational - # End-to-end health check @microshift @testdata @linux @windows @darwin @cleanup @@ -35,4 +33,4 @@ Feature: Microshift test stories And with up to "4" retries with wait period of "1m" http response from "http://httpd-example-testproj.apps.crc.testing" has status code "200" Then executing "curl -s http://httpd-example-testproj.apps.crc.testing" succeeds And stdout should contain "Hello CRC!" - Then with up to "4" retries with wait period of "1m" http response from "http://httpd-example-testproj.apps.crc.testing" has status code "200" \ No newline at end of file + Then with up to "4" retries with wait period of "1m" http response from "http://httpd-example-testproj.apps.crc.testing" has status code "200" diff --git a/test/e2e/testsuite/testsuite.go b/test/e2e/testsuite/testsuite.go index c1449a1360..24ac35c8c6 100644 --- a/test/e2e/testsuite/testsuite.go +++ b/test/e2e/testsuite/testsuite.go @@ -552,8 +552,6 @@ func InitializeScenario(s *godog.ScenarioContext) { DeleteFileFromCRCHome) s.Step(`^decode base64 file "(.*)" to "(.*)"$`, DecodeBase64File) - s.Step(`^ensuring network mode user$`, - EnsureUserNetworkmode) s.Step(`^ensuring microshift cluster is fully operational$`, EnsureMicroshiftClusterIsOperational) s.Step(`^kubeconfig is cleaned up$`, @@ -1004,10 +1002,6 @@ func setPodmanEnv() error { } func SetConfigPropertyToValueSucceedsOrFails(property string, value string, expected string) error { - // Since network-mode is only supported on Linux, we skip this property test for non-linux platforms - if property == "network-mode" && runtime.GOOS != "linux" { - return nil - } if value == "current bundle" { if !userProvidedBundle { value = filepath.Join(util.CRCHome, "cache", bundleName) @@ -1127,14 +1121,6 @@ func DecodeBase64File(inputFile, outputFile string) error { return util.ExecuteCommandSucceedsOrFails(cmd, "succeeds") } -func EnsureUserNetworkmode() error { - if runtime.GOOS == "linux" { - return crcCmd.SetConfigPropertyToValueSucceedsOrFails( - "network-mode", "user", "succeeds") - } - return nil -} - func EnsureKubeConfigIsCleanedUp() error { kubeConfig, cfg, err := machine.GetGlobalKubeConfig() if err != nil {