Skip to content
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

Increase wait time for nodes going ready #61

Merged
merged 2 commits into from
Apr 15, 2019
Merged

Increase wait time for nodes going ready #61

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
2200958
Inrease wait time for nodes going ready
enxebre Apr 12, 2019
cf41e6a
Skip machine healtch check
enxebre Apr 15, 2019
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
2 changes: 1 addition & 1 deletion pkg/e2e/framework/framework.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ func IsNodeReady(node *corev1.Node) bool {
}

func WaitUntilAllNodesAreReady(client runtimeclient.Client) error {
return wait.PollImmediate(1*time.Second, time.Minute, func() (bool, error) {
return wait.PollImmediate(1*time.Second, PoolNodesReadyTimeout, func() (bool, error) {
spangenberg marked this conversation as resolved.
Show resolved Hide resolved
nodeList := corev1.NodeList{}
if err := client.List(context.TODO(), &runtimeclient.ListOptions{}, &nodeList); err != nil {
glog.Errorf("error querying api for nodeList object: %v, retrying...", err)
Expand Down
21 changes: 6 additions & 15 deletions pkg/e2e/machinehealthcheck/machinehealthcheck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,9 @@ var _ = Describe("[Feature:MachineHealthCheck] MachineHealthCheck controller", f
client, err = e2e.LoadClient()
Expect(err).ToNot(HaveOccurred())

isKubemarkProvider, err := e2e.IsKubemarkProvider(client)
Expect(err).ToNot(HaveOccurred())

// TODO: remove once we can create or update kubemark machines
// that will give use possibility to make this test work
if isKubemarkProvider {
glog.V(2).Info("Can not run this tests with the 'KubeMark' provider")
Skip("Can not run this tests with the 'KubeMark' provider")
}
// TODO: enable once https://github.com/openshift/cluster-api-actuator-pkg/pull/61 is fixed
glog.V(2).Info("Skipping machine health checking test")
Skip("Skipping machine health checking test")

workerNodes, err := e2e.GetWorkerNodes(client)
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -118,12 +112,9 @@ var _ = Describe("[Feature:MachineHealthCheck] MachineHealthCheck controller", f
})

AfterEach(func() {
isKubemarkProvider, err := e2e.IsKubemarkProvider(client)
Expect(err).ToNot(HaveOccurred())
if isKubemarkProvider {
glog.V(2).Info("Can not run this tests with the 'KubeMark' provider")
Skip("Can not run this tests with the 'KubeMark' provider")
}
// TODO: enable once https://github.com/openshift/cluster-api-actuator-pkg/pull/61 is fixed
glog.V(2).Info("Skipping machine health checking test")
Skip("Skipping machine health checking test")

waitForWorkersToGetReady(numberOfReadyWorkers)
deleteMachineHealthCheck(e2e.MachineHealthCheckName)
Expand Down