From f6e907cdcadbf7cd412e7fd28aa7010a02b6f842 Mon Sep 17 00:00:00 2001
From: Ioannis Kakavas <ioannis@elastic.co>
Date: Tue, 2 Jun 2020 09:13:59 +0300
Subject: [PATCH] Disable testingConventions in build tools in fips (#57357)

* Disable testingConventions in build tools in fips

Necessary since we also disable unit tests and
testingConventions would fail in FIPS 140 mode.
---
 buildSrc/build.gradle | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index dc827ee0279f5..27d3da245260a 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -177,8 +177,11 @@ if (project != rootProject) {
     'forbiddenApisTest', 'forbiddenApisIntegTest', 'forbiddenApisTestFixtures')
   jarHell.enabled = false
   thirdPartyAudit.enabled = false
-  if (Boolean.parseBoolean(System.getProperty("tests.fips.enabled"))) {
+  if (org.elasticsearch.gradle.info.BuildParams.inFipsJvm) {
+    // We don't support running gradle with a JVM that is in FIPS 140 mode, so we don't test it.
+    // WaitForHttpResourceTests tests would fail as they use JKS/PKCS12 keystores
     test.enabled = false
+    testingConventions.enabled = false
   }
 
   configurations {