Skip to content

Commit 0033614

Browse files
authored
[3.4] Prevent use of shared distribution on gradle builds (#20227)
* Prevent use of shared distribution on gradle builds Signed-off-by: Daniel Widdis <widdis@gmail.com> * Test the new workaround condition Signed-off-by: Daniel Widdis <widdis@gmail.com> --------- Signed-off-by: Daniel Widdis <widdis@gmail.com>
1 parent 62c3bdc commit 0033614

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

buildSrc/src/integTest/groovy/org/opensearch/gradle/TestClustersPluginFuncTest.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ class TestClustersPluginFuncTest extends AbstractGradleFuncTest {
121121
}
122122

123123
boolean assertNoCustomDistro(String clusterName) {
124-
assert !customDistroFolder(clusterName).exists()
124+
// Temporarily disabled, see https://github.com/opensearch-project/OpenSearch/pull/20227
125+
// assert !customDistroFolder(clusterName).exists()
126+
assert customDistroFolder(clusterName).exists()
125127
true
126128
}
127129

buildSrc/src/main/java/org/opensearch/gradle/testclusters/OpenSearchNode.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,9 @@ public synchronized void start() {
590590
private boolean canUseSharedDistribution() {
591591
// using original location can be too long due to MAX_PATH restrictions on windows CI
592592
// TODO revisit when moving to shorter paths on CI by using Teamcity
593-
return OS.current() != OS.WINDOWS && extraJarFiles.size() == 0 && modules.size() == 0 && plugins.size() == 0;
593+
// return OS.current() != OS.WINDOWS && extraJarFiles.size() == 0 && modules.size() == 0 && plugins.size() == 0;
594+
// Workaround on Gradle 8.6+ due to JVM GC logging to OpenSearch execution directory in immutable workspace
595+
return false;
594596
}
595597

596598
private void logToProcessStdout(String message) {

0 commit comments

Comments
 (0)