Skip to content

Commit

Permalink
[fips] do not expliclity set the default distro (#91101)
Browse files Browse the repository at this point in the history
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 #77632

fixes: #70005
related: #77632
  • Loading branch information
jakelandis authored Oct 26, 2022
1 parent 25fc5c2 commit 4d27313
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ if (BuildParams.inFipsJvm) {
dependsOn 'fipsResources'
}
testClusters.configureEach {
setTestDistribution(TestDistribution.DEFAULT)
extraConfigFile "fips_java.security", fipsSecurity
extraConfigFile "fips_java.policy", fipsPolicy
extraConfigFile "cacerts.bcfks", fipsTrustStore
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ public class ElasticsearchNode implements TestClusterConfiguration {
"path.repo",
"discovery.seed_providers",
"cluster.deprecation_indexing.enabled",
"cluster.initial_master_nodes"
"cluster.initial_master_nodes",
"xpack.security.enabled"

);

Expand Down

0 comments on commit 4d27313

Please sign in to comment.