Merge pull request #121531 from saschagrunert/e2e-node-imageid

Make e2e node image ID test more flexible

test/e2e_node/image_id_test.go

@@ -60,12 +60,12 @@ var _ = SIGDescribe("ImageID [NodeFeature: ImageID]", func() {
 		framework.ExpectNoError(err)
 
 		status := runningPod.Status
-
-		if len(status.ContainerStatuses) == 0 {
-			framework.Failf("Unexpected pod status; %s", dump.Pretty(status))
-			return
-		}
-
-		gomega.Expect(status.ContainerStatuses[0].ImageID).To(gomega.ContainSubstring(busyBoxImage))
+		gomega.Expect(status.ContainerStatuses).To(gomega.HaveLen(1), dump.Pretty(status))
+		gomega.Expect(status.ContainerStatuses[0].ImageID).To(
+			gomega.SatisfyAny(
+				gomega.Equal(busyBoxImage),
+				gomega.MatchRegexp(`[[:xdigit:]]{64}`),
+			),
+		)
 	})
 })