Disable testingConventions in build tools in fips (#57357) (#57504)

Necessary since we also disable unit tests and testingConventions would fail in FIPS 140 mode.
elastic · Jun 2, 2020 · 9143041 · 9143041
1 parent fb1a5bf
commit 9143041
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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 {