NO-JIRA removed code related to gradle enterprise trial

diff --git a/build.gradle b/build.gradle
index 196ed2a73cd874a8ac817e8152c6afffc2f1cffd..c4c22153f3efdac1d09c5200362d8f72145c9e13 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -49,15 +49,6 @@ allprojects {
       ext.versionWithoutBuildNumber = version
       version = (version.toString().count('.') == 1 ? "${version}.0.${ext.buildNumber}" : "${version}.${ext.buildNumber}").toString()
   }
-  
-  tasks.matching { task -> task instanceof Test || task instanceof BlackBoxTest}.configureEach {
-    retry {
-      if (System.getenv('CI') == "true") {
-        maxRetries = 3
-        failOnPassedAfterRetry = true
-      }
-    }
-  }
 
   task cacheDependencies {
     doLast {

diff --git a/settings.gradle b/settings.gradle
index fb8938449ffb788cf17663714da4f2770bca7c55..b7ed03a7c55e814db9c849748aaeae80469b5246 100644 (file)
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,31 +10,6 @@ pluginManagement {
   }
 }
 
-plugins {
-  id 'com.gradle.enterprise' version '3.15.1'
-}
-ext.isCiServer = System.getenv().containsKey("CIRRUS_CI")
-
-gradleEnterprise {
-  if (System.getenv().containsKey('GRADLE_ENTERPRISE_URL')) {
-    server = System.env.'GRADLE_ENTERPRISE_URL'
-  }
-  allowUntrustedServer = true // ensure a trusted certificate is configured
-
-  if (isCiServer) {
-    accessKey = System.env.'GRADLE_ENTERPRISE_KEY'
-  }
-
-  buildScan {
-    capture { taskInputFiles = true }
-    uploadInBackground = false
-    publishAlwaysIf( isCiServer )
-  }
-  if (System.getenv().containsKey('CIRRUS_BRANCH')) {
-    buildScan.value 'BranchName', System.env.'CIRRUS_BRANCH'
-  }
-}
-
 rootProject.name = 'sonarqube'
 
 include 'plugins:sonar-xoo-plugin'
@@ -87,6 +62,7 @@ include 'sonar-ws-generator'
 include 'test-monitoring'
 include 'ut-monitoring'
 
+ext.isCiServer = System.getenv().containsKey("CIRRUS_CI")
 
 // use Settings.getRootDir() so that it doesn't matter which directory you are executing from
 File extraSettings = new File(rootDir, 'private/private-settings.gradle')
@@ -98,15 +74,4 @@ buildCache {
   local {
     enabled = !isCiServer
   }
-
-  remote(HttpBuildCache) {
-    url = System.env.'GRADLE_ENTERPRISE_URL' + '/cache/'
-    allowUntrustedServer = true
-    credentials { creds ->
-      creds.username = System.env.'GRADLE_ENTERPRISE_USERNAME'
-      creds.password = System.env.'GRADLE_ENTERPRISE_PASSWORD'
-    }
-    enabled = true
-    push = isCiServer
-  }
 }
\ No newline at end of file