Temporarily disable the flaky testConflictErrorAndUnfinishedAspectAnalysis_mergedAnalysisExecution.
@@ -41,6 +41,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -413,6 +414,7 @@ public class OutputArtifactConflictTest extends BuildIntegrationTestCase {
// Verify that an aspect whose analysis is unfinished doesn't fail the conflict reporting process.
@Test
+ @Ignore("b/216490090 - flaky")
public void testConflictErrorAndUnfinishedAspectAnalysis_mergedAnalysisExecution(
@TestParameter boolean keepGoing) throws Exception {
addOptions("--experimental_merged_skyframe_analysis_execution");
