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)
This commit is contained in:
Yogesh Gaikwad 2019-07-18 15:07:33 +10:00 committed by Yogesh Gaikwad
parent ec0a0a41db
commit 4c95cc3223

View File

@ -137,7 +137,7 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
description = "Runs rest tests against an elasticsearch cluster with HDFS."
dependsOn(project.bundlePlugin)
if ((project.ext.has('inFipsJvm') && project.ext.inFipsJvm) || disabledIntegTestTaskNames.contains(integTestTaskName)) {
if (disabledIntegTestTaskNames.contains(integTestTaskName)) {
enabled = false;
}
@ -150,6 +150,7 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
}
runner {
onlyIf { project.inFipsJvm == false }
if (integTestTaskName.contains("Ha")) {
if (integTestTaskName.contains("Secure")) {
Path path = buildDir.toPath()
@ -194,7 +195,6 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
}
}
// Determine HDFS Fixture compatibility for the current build environment.
boolean fixtureSupported = false
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
@ -223,6 +223,7 @@ if (legalPath == false) {
// Always ignore HA integration tests in the normal integration test runner, they are included below as
// part of their own HA-specific integration test tasks.
integTest.runner {
onlyIf { project.inFipsJvm == false }
exclude('**/Ha*TestSuiteIT.class')
}