Skip to content

Commit e34d7fd

Browse files
authored
Always test against default distribution when in a FIPS JVM (#51273)
1 parent c7aaf5a commit e34d7fd

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import org.elasticsearch.gradle.precommit.PrecommitTasks
3232
import org.elasticsearch.gradle.test.ErrorReportingTestListener
3333
import org.elasticsearch.gradle.testclusters.ElasticsearchCluster
3434
import org.elasticsearch.gradle.testclusters.TestClustersPlugin
35+
import org.elasticsearch.gradle.testclusters.TestDistribution
3536
import org.elasticsearch.gradle.tool.Boilerplate
3637
import org.gradle.api.Action
3738
import org.gradle.api.GradleException
@@ -159,6 +160,7 @@ class BuildPlugin implements Plugin<Project> {
159160
for (File dep : project.getConfigurations().getByName("extraJars").getFiles()){
160161
cluster.extraJarFile(dep)
161162
}
163+
cluster.setTestDistribution(TestDistribution.DEFAULT)
162164
cluster.extraConfigFile("fips_java.security", securityProperties)
163165
cluster.extraConfigFile("fips_java.policy", securityPolicy)
164166
cluster.extraConfigFile("cacerts.bcfks", bcfksKeystore)

plugins/examples/painless-whitelist/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
import org.elasticsearch.gradle.info.BuildParams
20+
1921
apply plugin: 'elasticsearch.testclusters'
2022
apply plugin: 'elasticsearch.esplugin'
2123

@@ -33,7 +35,7 @@ dependencies {
3335
}
3436

3537
testClusters.integTest {
36-
testDistribution = 'oss'
38+
testDistribution = BuildParams.inFipsJvm ? 'DEFAULT' : 'OSS'
3739
}
3840

3941
test.enabled = false

0 commit comments

Comments
 (0)