Disable repository-hdfs tests in FIPS jvm (#44283)

Due to https://github.com/elastic/elasticsearch/issues/40079,
we need to disable repository-hdfs tests in FIPS jvm.
This commit is contained in:
Yogesh Gaikwad 2019-07-13 10:07:40 +10:00 committed by Yogesh Gaikwad
parent 33627ef410
commit b40b6dd542
1 changed files with 2 additions and 2 deletions

View File

@ -92,7 +92,7 @@ for (String fixtureName : ['hdfsFixture', 'haHdfsFixture', 'secureHdfsFixture',
executable = new File(project.runtimeJavaHome, 'bin/java') executable = new File(project.runtimeJavaHome, 'bin/java')
env 'CLASSPATH', "${ -> project.configurations.hdfsFixture.asPath }" env 'CLASSPATH', "${ -> project.configurations.hdfsFixture.asPath }"
maxWaitInSeconds 60 maxWaitInSeconds 60
onlyIf { project(':test:fixtures:krb5kdc-fixture').buildFixture.enabled } onlyIf { project(':test:fixtures:krb5kdc-fixture').buildFixture.enabled && project.inFipsJvm == false }
waitCondition = { fixture, ant -> waitCondition = { fixture, ant ->
// the hdfs.MiniHDFS fixture writes the ports file when // the hdfs.MiniHDFS fixture writes the ports file when
// it's ready, so we can just wait for the file to exist // it's ready, so we can just wait for the file to exist
@ -137,7 +137,7 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
description = "Runs rest tests against an elasticsearch cluster with HDFS." description = "Runs rest tests against an elasticsearch cluster with HDFS."
dependsOn(project.bundlePlugin) dependsOn(project.bundlePlugin)
if (disabledIntegTestTaskNames.contains(integTestTaskName)) { if ((project.ext.has('inFipsJvm') && project.ext.inFipsJvm) || disabledIntegTestTaskNames.contains(integTestTaskName)) {
enabled = false; enabled = false;
} }