diff --git a/test/e2e/bootcnode_test.go b/test/e2e/bootcnode_test.go index b2f324d..c83b982 100644 --- a/test/e2e/bootcnode_test.go +++ b/test/e2e/bootcnode_test.go @@ -77,6 +77,7 @@ func TestControllerMembership(t *testing.T) { var pods corev1.PodList err := env.Client.List(ctx, &pods, client.InNamespace(testutil.OperatorNamespaceName), + client.MatchingFields{"spec.nodeName": nodeName}, client.MatchingLabels{ "app.kubernetes.io/name": "bootc-operator", "app.kubernetes.io/component": "daemon", @@ -423,7 +424,9 @@ func TestMidRolloutImageChange(t *testing.T) { t.Logf("Switched pool to second update image %s", updateRef2) // Phase 6: Wait for both nodes to be Idle with the second update image. - for _, nodeName := range []string{nodeA, nodeB} { + // Reboots are serialized: wait for the node already rebooting first so + // the other node's timeout does not include waiting for its reboot slot. + for _, nodeName := range []string{rebootingNode, otherNode} { testutil.WaitForNodeIdle(t, g, ctx, env.Client, nodeName, 8*time.Minute, HaveField("Booted", HaveField("ImageDigest", Equal(env.NodeImageUpdate2Digest()))), )