Skip to content

Commit

Permalink
[e2e] increase timeouts.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sedef committed Apr 13, 2020
1 parent 3acda52 commit 538edf6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions test/infrastructure/docker/e2e/docker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var _ = Describe("Docker Create", func() {
mgmtClient ctrlclient.Client
cluster *clusterv1.Cluster
)
SetDefaultEventuallyTimeout(10 * time.Minute)
SetDefaultEventuallyTimeout(15 * time.Minute)
SetDefaultEventuallyPollingInterval(10 * time.Second)

AfterEach(func() {
Expand Down Expand Up @@ -137,7 +137,7 @@ var _ = Describe("Docker Create", func() {
Cluster: cluster,
ControlPlane: controlPlane,
}
framework.WaitForOneKubeadmControlPlaneMachineToExist(ctx, waitForOneKubeadmControlPlaneMachineToExistInput, "5m")
framework.WaitForOneKubeadmControlPlaneMachineToExist(ctx, waitForOneKubeadmControlPlaneMachineToExistInput, "15m")

// Insatll a networking solution on the workload cluster
workloadClient, err := mgmt.GetWorkloadClient(ctx, cluster.Namespace, cluster.Name)
Expand Down Expand Up @@ -218,7 +218,7 @@ var _ = Describe("Docker Create", func() {
return 0, err
}
return len(machineList.Items), nil
}, "10m", "5s").Should(Equal(int(*controlPlane.Spec.Replicas) - 1))
}, "15m", "5s").Should(Equal(int(*controlPlane.Spec.Replicas) - 1))

By("ensuring a replacement machine is created")
Eventually(func() (int, error) {
Expand All @@ -228,7 +228,7 @@ var _ = Describe("Docker Create", func() {
return 0, err
}
return len(machineList.Items), nil
}, "10m", "30s").Should(Equal(int(*controlPlane.Spec.Replicas)))
}, "15m", "30s").Should(Equal(int(*controlPlane.Spec.Replicas)))
})
})

Expand Down
12 changes: 6 additions & 6 deletions test/infrastructure/docker/e2e/docker_upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ var _ = Describe("Docker Upgrade", func() {
cluster *clusterv1.Cluster
controlPlane *controlplanev1.KubeadmControlPlane
)
SetDefaultEventuallyTimeout(10 * time.Minute)
SetDefaultEventuallyTimeout(15 * time.Minute)
SetDefaultEventuallyPollingInterval(10 * time.Second)

BeforeEach(func() {
Expand Down Expand Up @@ -97,7 +97,7 @@ var _ = Describe("Docker Upgrade", func() {
Cluster: cluster,
ControlPlane: controlPlane,
}
framework.WaitForOneKubeadmControlPlaneMachineToExist(ctx, waitForOneKubeadmControlPlaneMachineToExistInput, "5m")
framework.WaitForOneKubeadmControlPlaneMachineToExist(ctx, waitForOneKubeadmControlPlaneMachineToExistInput, "15m")

// Insatll a networking solution on the workload cluster
workloadClient, err := mgmt.GetWorkloadClient(ctx, cluster.Namespace, cluster.Name)
Expand All @@ -116,7 +116,7 @@ var _ = Describe("Docker Upgrade", func() {
Cluster: cluster,
ControlPlane: controlPlane,
}
framework.WaitForKubeadmControlPlaneMachinesToExist(ctx, assertKubeadmControlPlaneNodesExistInput, "10m", "10s")
framework.WaitForKubeadmControlPlaneMachinesToExist(ctx, assertKubeadmControlPlaneNodesExistInput, "15m", "10s")

// Create the workload nodes
createMachineDeploymentinput := framework.CreateMachineDeploymentInput{
Expand Down Expand Up @@ -228,7 +228,7 @@ var _ = Describe("Docker Upgrade", func() {
return 0, errors.New("old nodes remain")
}
return upgraded, nil
}, "10m", "30s").Should(Equal(int(*controlPlane.Spec.Replicas)))
}, "15m", "30s").Should(Equal(int(*controlPlane.Spec.Replicas)))

workloadClient, err := mgmt.GetWorkloadClient(ctx, cluster.Namespace, cluster.Name)
Expect(err).ToNot(HaveOccurred())
Expand All @@ -245,7 +245,7 @@ var _ = Describe("Docker Upgrade", func() {
}

return false, nil
}, "10m", "30s").Should(BeTrue())
}, "15m", "30s").Should(BeTrue())

By("ensuring CoreDNS has the correct image")
Eventually(func() (bool, error) {
Expand All @@ -259,7 +259,7 @@ var _ = Describe("Docker Upgrade", func() {
}

return false, nil
}, "10m", "30s").Should(BeTrue())
}, "15m", "30s").Should(BeTrue())

// Before patching ensure all pods are ready in workload cluster
// Might not need this step any more.
Expand Down

0 comments on commit 538edf6

Please sign in to comment.