Skip to content

Commit 4d27313

Browse files
authored
[fips] do not expliclity set the default distro (elastic#91101)
This commit no longer explicitly sets the default configuration for FIPS tests. This allows each project's tests to run in FIPS mode with out deviation (other than the FIPS mode). A side product of this change is that any REST test can now enable security if they so choose without needing to use the default distribution. This allows for additional usage of the integ_test distribution which can help with testing modularization. This only possible now that the security plugin is always included with the integ_test distribution via elastic#77632 fixes: elastic#70005 related: elastic#77632
1 parent 25fc5c2 commit 4d27313

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

build-tools-internal/src/main/groovy/elasticsearch.fips.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ if (BuildParams.inFipsJvm) {
5757
dependsOn 'fipsResources'
5858
}
5959
testClusters.configureEach {
60-
setTestDistribution(TestDistribution.DEFAULT)
6160
extraConfigFile "fips_java.security", fipsSecurity
6261
extraConfigFile "fips_java.policy", fipsPolicy
6362
extraConfigFile "cacerts.bcfks", fipsTrustStore

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ public class ElasticsearchNode implements TestClusterConfiguration {
114114
"path.repo",
115115
"discovery.seed_providers",
116116
"cluster.deprecation_indexing.enabled",
117-
"cluster.initial_master_nodes"
117+
"cluster.initial_master_nodes",
118+
"xpack.security.enabled"
118119

119120
);
120121

0 commit comments

Comments
 (0)