Skip to content

Commit 4c95cc3

Browse files
bizybotYogesh Gaikwad
authored andcommitted
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 ec0a0a4 commit 4c95cc3

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
@@ -137,7 +137,7 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
137137
description = "Runs rest tests against an elasticsearch cluster with HDFS."
138138
dependsOn(project.bundlePlugin)
139139

140-
if ((project.ext.has('inFipsJvm') && project.ext.inFipsJvm) || disabledIntegTestTaskNames.contains(integTestTaskName)) {
140+
if (disabledIntegTestTaskNames.contains(integTestTaskName)) {
141141
enabled = false;
142142
}
143143

@@ -150,6 +150,7 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
150150
}
151151

152152
runner {
153+
onlyIf { project.inFipsJvm == false }
153154
if (integTestTaskName.contains("Ha")) {
154155
if (integTestTaskName.contains("Secure")) {
155156
Path path = buildDir.toPath()
@@ -194,7 +195,6 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
194195
}
195196
}
196197

197-
198198
// Determine HDFS Fixture compatibility for the current build environment.
199199
boolean fixtureSupported = false
200200
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
@@ -223,6 +223,7 @@ if (legalPath == false) {
223223
// Always ignore HA integration tests in the normal integration test runner, they are included below as
224224
// part of their own HA-specific integration test tasks.
225225
integTest.runner {
226+
onlyIf { project.inFipsJvm == false }
226227
exclude('**/Ha*TestSuiteIT.class')
227228
}
228229

0 commit comments

Comments
 (0)