Fixed WildcardRollingUpgradeIT and TextRollingUpgradeIT failures (#137851)

Author: Kubik42

muted-tests.yml

@@ -444,18 +444,15 @@ tests:
   method: testSimilarityWithOneDimVector {functionName=v_cosine
     similarityFunction=org.elasticsearch.xpack.esql.expression.function.vector.CosineSimilarity$1@5b068087 elementType=byte}
   issue: https://github.com/elastic/elasticsearch/issues/137778
-- class: org.elasticsearch.upgrades.WildcardRollingUpgradeIT
-  method: testIndexing {upgradedNodes=0}
-  issue: https://github.com/elastic/elasticsearch/issues/137793
-- class: org.elasticsearch.upgrades.TextRollingUpgradeIT
-  method: testIndexing {upgradedNodes=0}
-  issue: https://github.com/elastic/elasticsearch/issues/137794
-- class: org.elasticsearch.upgrades.WildcardRollingUpgradeIT
-  method: testIndexing {upgradedNodes=1}
-  issue: https://github.com/elastic/elasticsearch/issues/137795
-- class: org.elasticsearch.upgrades.TextRollingUpgradeIT
-  method: testIndexing {upgradedNodes=1}
-  issue: https://github.com/elastic/elasticsearch/issues/137796
+- class: org.elasticsearch.xpack.inference.integration.CCMPersistentStorageServiceIT
+  method: testDelete_RemovesCCMConfiguration
+  issue: https://github.com/elastic/elasticsearch/issues/137786
+- class: org.elasticsearch.xpack.inference.integration.CCMPersistentStorageServiceIT
+  method: testDelete_DoesNotThrow_WhenTheConfigurationDoesNotExist
+  issue: https://github.com/elastic/elasticsearch/issues/137797
+- class: org.elasticsearch.xpack.inference.integration.CCMServiceIT
+  method: testIsEnabled_ReturnsTrue_WhenCCMConfigurationIsPresent
+  issue: https://github.com/elastic/elasticsearch/issues/137798
 - class: org.elasticsearch.xpack.esql.vector.VectorSimilarityFunctionsIT
   method: testSimilarityWithOneDimVector {functionName=v_cosine
     similarityFunction=org.elasticsearch.xpack.esql.expression.function.vector.CosineSimilarity$1@3300f4fd elementType=byte}

x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/AbstractStringTypeRollingUpgradeIT.java

@@ -96,6 +96,7 @@ public void testIndexingWithMultifield() throws Exception {
     protected void testIndexing(boolean shouldIncludeKeywordMultifield) throws Exception {
         String dataStreamName = DATA_STREAM + (shouldIncludeKeywordMultifield ? "-multifield" : "");
         if (isOldCluster()) {
+            // given - reset data stream since it could've been used by other tests
             smallestMessageMap.remove(dataStreamName);
 
             // given - enable logsdb and create a template
@@ -235,7 +236,7 @@ private String bulkIndexRequestBody(String dataStreamName, int numDocs, Instant
     /**
      * Generates a string containing a random number of random length alphas, all delimited by space.
      */
-    public static String randomAlphasDelimitedBySpace(int maxAlphas, int minCodeUnits, int maxCodeUnits) {
+    private static String randomAlphasDelimitedBySpace(int maxAlphas, int minCodeUnits, int maxCodeUnits) {
         int numAlphas = randomIntBetween(1, maxAlphas);
         List<String> alphas = new ArrayList<>(numAlphas);
         for (int i = 0; i < numAlphas; i++) {