Merge branch 'main' into fix116276

iverase · Nov 6, 2024 · 0b7c503 · 0b7c503
2 parents c65c248 + a902878
commit 0b7c503
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/qa/packaging/src/test/java/org/elasticsearch/packaging/test/ArchiveTests.java b/qa/packaging/src/test/java/org/elasticsearch/packaging/test/ArchiveTests.java
@@ -19,6 +19,7 @@
 import org.elasticsearch.packaging.util.ServerUtils;
 import org.elasticsearch.packaging.util.Shell;
 import org.elasticsearch.packaging.util.Shell.Result;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 
 import java.nio.file.Files;
@@ -112,6 +113,10 @@ public void test32SpecialCharactersInJdkPath() throws Exception {
     }
 
     public void test40AutoconfigurationNotTriggeredWhenNodeIsMeantToJoinExistingCluster() throws Exception {
+        Assume.assumeFalse(
+            "https://github.com/elastic/elasticsearch/issues/116299",
+            distribution.platform == Distribution.Platform.WINDOWS
+        );
         // auto-config requires that the archive owner and the process user be the same,
         Platforms.onWindows(() -> sh.chown(installation.config, installation.getOwner()));
         FileUtils.assertPathsDoNotExist(installation.data);
@@ -124,8 +129,11 @@ public void test40AutoconfigurationNotTriggeredWhenNodeIsMeantToJoinExistingClus
         FileUtils.rm(installation.data);
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/116299")
     public void test41AutoconfigurationNotTriggeredWhenNodeCannotContainData() throws Exception {
+        Assume.assumeFalse(
+            "https://github.com/elastic/elasticsearch/issues/116299",
+            distribution.platform == Distribution.Platform.WINDOWS
+        );
         // auto-config requires that the archive owner and the process user be the same
         Platforms.onWindows(() -> sh.chown(installation.config, installation.getOwner()));
         ServerUtils.addSettingToExistingConfiguration(installation, "node.roles", "[\"voting_only\", \"master\"]");
@@ -138,6 +146,10 @@ public void test41AutoconfigurationNotTriggeredWhenNodeCannotContainData() throw
     }
 
     public void test42AutoconfigurationNotTriggeredWhenNodeCannotBecomeMaster() throws Exception {
+        Assume.assumeFalse(
+            "https://github.com/elastic/elasticsearch/issues/116299",
+            distribution.platform == Distribution.Platform.WINDOWS
+        );
         // auto-config requires that the archive owner and the process user be the same
         Platforms.onWindows(() -> sh.chown(installation.config, installation.getOwner()));
         ServerUtils.addSettingToExistingConfiguration(installation, "node.roles", "[\"ingest\"]");