Skip to content
Merged
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion test/e2e/bootcnode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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()))),
)
Expand Down
Loading