Skip to content

test: microshift: Don't force network-mode to 'user' #3804

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

test: microshift: Don't force network-mode to 'user' #3804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1c76f4
test: microshift: Don't force network-mode to 'user'
cfergeau Aug 25, 2023
5127ff3
Revert "e2e test: Ignore network-mode config property for non linux p…
cfergeau Aug 25, 2023
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
4 changes: 1 addition & 3 deletions test/e2e/features/story_microshift.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
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"
14 changes: 0 additions & 14 deletions test/e2e/testsuite/testsuite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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$`,
Expand Down Expand 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
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this still true? On linux network-mode is still have option for system and user (being default)?

if value == "current bundle" {
if !userProvidedBundle {
value = filepath.Join(util.CRCHome, "cache", bundleName)
Expand Down Expand Up @@ -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 {
Expand Down