Merge pull request #1073 from marquiz/devel/e2e-worker-wait

test/e2e: reduce worker wait-for-ready period to 2s
kubernetes-sigs · Mar 7, 2023 · 2b86575 · 2b86575
2 parents 9d51716 + 67bb6c2
commit 2b86575
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/test/e2e/node_feature_discovery_test.go b/test/e2e/node_feature_discovery_test.go
@@ -330,8 +330,8 @@ var _ = SIGDescribe("NFD master and worker", func() {
 					workerDS, err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Create(context.TODO(), workerDS, metav1.CreateOptions{})
 					Expect(err).NotTo(HaveOccurred())
 
-					By("Waiting for daemonset pods to be ready")
-					Expect(testpod.WaitForReady(f.ClientSet, f.Namespace.Name, workerDS.Spec.Template.Labels["name"], 5)).NotTo(HaveOccurred())
+					By("Waiting for worker daemonset pods to be ready")
+					Expect(testpod.WaitForReady(f.ClientSet, f.Namespace.Name, workerDS.Spec.Template.Labels["name"], 2)).NotTo(HaveOccurred())
 
 					By("Getting node objects")
 					nodeList, err := f.ClientSet.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
@@ -463,8 +463,8 @@ var _ = SIGDescribe("NFD master and worker", func() {
 					workerDS, err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Create(context.TODO(), workerDS, metav1.CreateOptions{})
 					Expect(err).NotTo(HaveOccurred())
 
-					By("Waiting for daemonset pods to be ready")
-					Expect(testpod.WaitForReady(f.ClientSet, f.Namespace.Name, workerDS.Spec.Template.Labels["name"], 5)).NotTo(HaveOccurred())
+					By("Waiting for worker daemonset pods to be ready")
+					Expect(testpod.WaitForReady(f.ClientSet, f.Namespace.Name, workerDS.Spec.Template.Labels["name"], 2)).NotTo(HaveOccurred())
 
 					By("Getting target node and checking labels")
 					targetNode, err := f.ClientSet.CoreV1().Nodes().Get(context.TODO(), targetNodeName, metav1.GetOptions{})
@@ -546,7 +546,7 @@ var _ = SIGDescribe("NFD master and worker", func() {
 					Expect(err).NotTo(HaveOccurred())
 
 					By("Waiting for worker daemonset pods to be ready")
-					Expect(testpod.WaitForReady(f.ClientSet, f.Namespace.Name, workerDS.Spec.Template.Labels["name"], 5)).NotTo(HaveOccurred())
+					Expect(testpod.WaitForReady(f.ClientSet, f.Namespace.Name, workerDS.Spec.Template.Labels["name"], 2)).NotTo(HaveOccurred())
 
 					By("Verifying node labels from nfd-worker")
 					expectedLabels = map[string]k8sLabels{
@@ -621,8 +621,8 @@ core:
 					workerDS, err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Create(context.TODO(), workerDS, metav1.CreateOptions{})
 					Expect(err).NotTo(HaveOccurred())
 
-					By("Waiting for daemonset pods to be ready")
-					Expect(testpod.WaitForReady(f.ClientSet, f.Namespace.Name, workerDS.Spec.Template.Labels["name"], 5)).NotTo(HaveOccurred())
+					By("Waiting for worker daemonset pods to be ready")
+					Expect(testpod.WaitForReady(f.ClientSet, f.Namespace.Name, workerDS.Spec.Template.Labels["name"], 2)).NotTo(HaveOccurred())
 
 					expected := map[string]k8sLabels{
 						"*": {