Browse Source

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.
Ioannis Kakavas 5 years ago
parent
commit
ad374ed833
1 changed files with 4 additions and 1 deletions
  1. 4 1
      buildSrc/build.gradle

+ 4 - 1
buildSrc/build.gradle

@@ -174,8 +174,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 {