Merge pull request #18664 from mtrmac/rm-concurrent-flake

In a concurrent removal test, don't remove concurrently with builds

test/e2e/rmi_test.go

@@ -266,7 +266,10 @@ RUN find $LOCAL
 		podmanTest.AddImageToRWStore(CIRROS_IMAGE)
 		var wg sync.WaitGroup
 
-		buildAndRemove := func(i int) {
+		// Prepare images
+		wg.Add(10)
+		for i := 0; i < 10; i++ {
+			go func(i int) {
 				defer GinkgoRecover()
 				defer wg.Done()
 				imageName := fmt.Sprintf("rmtest:%d", i)
@@ -274,14 +277,22 @@ RUN find $LOCAL
 	RUN touch %s`, CIRROS_IMAGE, imageName)
 
 				podmanTest.BuildImage(containerfile, imageName, "false")
+			}(i)
+		}
+		wg.Wait()
+
+		// A herd of concurrent removals
+		wg.Add(10)
+		for i := 0; i < 10; i++ {
+			go func(i int) {
+				defer GinkgoRecover()
+				defer wg.Done()
+
+				imageName := fmt.Sprintf("rmtest:%d", i)
 				session := podmanTest.Podman([]string{"rmi", "-f", imageName})
 				session.WaitWithDefaultTimeout()
 				Expect(session).Should(Exit(0))
-		}
+			}(i)
-
-		wg.Add(10)
-		for i := 0; i < 10; i++ {
-			go buildAndRemove(i)
 		}
 		wg.Wait()
 	})