Fix remaining loop devices manipulations in NodeSetup E2Es

Author: czeslavo

test/e2e/set/nodeconfig/nodeconfig_disksetup.go

@@ -530,7 +530,7 @@ var _ = g.Describe("Node Setup", framework.Serial, func() {
 		}),
 	)
 
-	g.It("should successfully start a failed mount unit with a corrupted filesystem when it's overwritten with a clean one", func(ctx context.Context) {
+	g.FIt("should successfully start a failed mount unit with a corrupted filesystem when it's overwritten with a clean one", func(ctx context.Context) {
 		o.Expect(matchingNodes).NotTo(o.BeEmpty())
 		o.Expect(matchingNodes[0]).NotTo(o.BeNil())
 		nodeUnderTest := matchingNodes[0]
@@ -607,7 +607,6 @@ var _ = g.Describe("Node Setup", framework.Serial, func() {
 		framework.By("Getting the filesystem's block size")
 		stdout, stderr, err = executeInPod(ctx, f.ClientConfig(), f.KubeClient().CoreV1(), clientPod, "stat", "--file-system", "--format=%s", devicePathInContainer)
 		o.Expect(err).NotTo(o.HaveOccurred(), stdout, stderr)
-
 		blockSize := strings.TrimSpace(stdout)
 
 		framework.By("Corrupting the filesystem")
@@ -647,16 +646,10 @@ var _ = g.Describe("Node Setup", framework.Serial, func() {
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		framework.By("Overwriting the corrupted filesystem")
-		stdout, stderr, err = executeInPod(ctx, f.ClientConfig(), f.KubeClient().CoreV1(), clientPod, "mkfs", "-t", string(scyllav1alpha1.XFSFilesystem), "-b", fmt.Sprintf("size=%s", blockSize), "-K", "-f", hostDevicePath)
-		o.Expect(err).NotTo(o.HaveOccurred(), stdout, stderr)
-
-		framework.By("Zeroing XFS log")
-		stdout, stderr, err = executeInPod(ctx, f.ClientConfig(), f.KubeClient().CoreV1(), clientPod, "xfs_repair", "-L", "-f", hostDevicePath)
-		o.Expect(err).NotTo(o.HaveOccurred(), stdout, stderr)
-
-		framework.By("Verifying the filesystem's integrity")
-		stdout, stderr, err = executeInPod(ctx, f.ClientConfig(), f.KubeClient().CoreV1(), clientPod, "xfs_repair", "-o", "force_geometry", "-f", "-n", hostDevicePath)
-		o.Expect(err).NotTo(o.HaveOccurred(), stdout, stderr)
+		o.Eventually(func(g o.Gomega) {
+			stdout, stderr, err = executeInPod(ctx, f.ClientConfig(), f.KubeClient().CoreV1(), clientPod, "mkfs", "-t", string(scyllav1alpha1.XFSFilesystem), "-b", fmt.Sprintf("size=%s", blockSize), "-K", "-f", hostDevicePath)
+			g.Expect(err).NotTo(o.HaveOccurred(), stdout, stderr)
+		}).WithPolling(time.Second * 10).WithTimeout(time.Minute * 3).Should(o.Succeed())
 
 		framework.By("Waiting for NodeConfig to roll out")
 		ctx3, ctx3Cancel := context.WithTimeout(ctx, nodeConfigRolloutTimeout)