Skip to content

Commit dcfc6f9

Browse files
bizybotYogesh Gaikwad
authored and
Yogesh Gaikwad
committed
skip repository-hdfs integTest in case of fips jvm (#44319)
The repository-hdfs runners need to be disabled it in fips mode. Testing done for all the tasks, dynamic created and static (integTest, integTestHa, integSecureTest, integSecureHaTest)
1 parent 69d4cc0 commit dcfc6f9

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

plugins/repository-hdfs/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
125125
description = "Runs rest tests against an elasticsearch cluster with HDFS."
126126
dependsOn(project.bundlePlugin)
127127

128-
if ((project.ext.has('inFipsJvm') && project.ext.inFipsJvm) || disabledIntegTestTaskNames.contains(integTestTaskName)) {
128+
if (disabledIntegTestTaskNames.contains(integTestTaskName)) {
129129
enabled = false;
130130
}
131131

@@ -138,6 +138,7 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
138138
}
139139

140140
runner {
141+
onlyIf { project.inFipsJvm == false }
141142
if (integTestTaskName.contains("Ha")) {
142143
if (integTestTaskName.contains("Secure")) {
143144
Path path = buildDir.toPath()
@@ -182,7 +183,6 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
182183
}
183184
}
184185

185-
186186
// Determine HDFS Fixture compatibility for the current build environment.
187187
boolean fixtureSupported = false
188188
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
@@ -211,6 +211,7 @@ if (legalPath == false) {
211211
// Always ignore HA integration tests in the normal integration test runner, they are included below as
212212
// part of their own HA-specific integration test tasks.
213213
integTest.runner {
214+
onlyIf { project.inFipsJvm == false }
214215
exclude('**/Ha*TestSuiteIT.class')
215216
}
216217

0 commit comments

Comments
 (0)