Fix and reenable TribeIntegrationTests

Closes #31865

Author: ywelsch

modules/tribe/src/test/java/org/elasticsearch/tribe/TribeIntegrationTests.java

@@ -19,7 +19,6 @@
 
 package org.elasticsearch.tribe;
 
-import org.apache.lucene.util.LuceneTestCase;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.action.support.DestructiveOperations;
 import org.elasticsearch.client.Client;
@@ -87,7 +86,6 @@
  * Note, when talking to tribe client, no need to set the local flag on master read operations, it
  * does it by default.
  */
-@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/31865")
 @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE, numDataNodes = 0, numClientNodes = 0, transportClientRatio = 0.0)
 public class TribeIntegrationTests extends ESIntegTestCase {
 

test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java

@@ -1059,7 +1059,9 @@ public synchronized void validateClusterFormed(String viaNode) {
         try {
             if (awaitBusy(() -> {
                 DiscoveryNodes discoveryNodes = client.admin().cluster().prepareState().get().getState().nodes();
-                if (discoveryNodes.getSize() != expectedNodes.size()) {
+                boolean isTribeNode = nodes.values().size() == 1
+                    && nodes.values().iterator().next().node().settings().keySet().stream().anyMatch(s -> s.startsWith("tribe."));
+                if (discoveryNodes.getSize() != expectedNodes.size() && isTribeNode == false) {
                     return false;
                 }
                 for (DiscoveryNode expectedNode : expectedNodes) {