From b40b6dd5425f212c1b480f028d731dbf1f36e5b8 Mon Sep 17 00:00:00 2001
From: Yogesh Gaikwad <902768+bizybot@users.noreply.github.com>
Date: Sat, 13 Jul 2019 10:07:40 +1000
Subject: [PATCH] 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.
---
 plugins/repository-hdfs/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
index 258934e944e..ac2c54ba7db 100644
--- a/plugins/repository-hdfs/build.gradle
+++ b/plugins/repository-hdfs/build.gradle
@@ -92,7 +92,7 @@ for (String fixtureName : ['hdfsFixture', 'haHdfsFixture', 'secureHdfsFixture',
     executable = new File(project.runtimeJavaHome, 'bin/java')
     env 'CLASSPATH', "${ -> project.configurations.hdfsFixture.asPath }"
     maxWaitInSeconds 60
-    onlyIf {  project(':test:fixtures:krb5kdc-fixture').buildFixture.enabled }
+    onlyIf { project(':test:fixtures:krb5kdc-fixture').buildFixture.enabled && project.inFipsJvm == false }
     waitCondition = { fixture, ant ->
       // the hdfs.MiniHDFS fixture writes the ports file when
       // 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."
     dependsOn(project.bundlePlugin)
 
-    if (disabledIntegTestTaskNames.contains(integTestTaskName)) {
+    if ((project.ext.has('inFipsJvm') && project.ext.inFipsJvm) || disabledIntegTestTaskNames.contains(integTestTaskName)) {
       enabled = false;
     }