Fix configuration of Artifactory in QA tests (#400)

diff --git a/build.gradle b/build.gradle
index 2d2e2e907901fce60bde0ba07313aecd372d6ca8..d6f9bcc62b21218502d5921442182ac19341ff78 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -51,6 +51,8 @@ allprojects {
     def repository = project.hasProperty('cix') ? 'sonarsource-qa' : 'sonarsource'
     maven {
       url "https://repox.sonarsource.com/${repository}"
+      // The environment variables ARTIFACTORY_PRIVATE_USERNAME and ARTIFACTORY_PRIVATE_PASSWORD are used on QA env (Jenkins)
+      // On local box, please add artifactoryUsername and artifactoryPassword to ~/.gradle/gradle.properties
       def artifactoryUsername = System.env.'ARTIFACTORY_PRIVATE_USERNAME' ?: (project.hasProperty('artifactoryUsername') ? project.getProperty('artifactoryUsername') : '')
       def artifactoryPassword = System.env.'ARTIFACTORY_PRIVATE_PASSWORD' ?: (project.hasProperty('artifactoryPassword') ? project.getProperty('artifactoryPassword') : '')
       if (artifactoryUsername && artifactoryPassword) {

diff --git a/server/sonar-db-core/build.gradle b/server/sonar-db-core/build.gradle
index df83a0aeaacf465f032b37abe964f4f85c2939e4..10a0e9f4718da4c83f26a1082813337d32fdca43 100644 (file)
--- a/server/sonar-db-core/build.gradle
+++ b/server/sonar-db-core/build.gradle
@@ -47,8 +47,6 @@ task createDB(type:JavaExec) {
   classpath = sourceSets.test.runtimeClasspath
   systemProperty 'orchestrator.configUrl', System.getProperty('orchestrator.configUrl')
   systemProperty 'sonar.runtimeVersion', System.getProperty('sonar.runtimeVersion')
-  systemProperty 'orchestrator.artifactory.apiKey', System.getProperty('orchestrator.artifactory.apiKey')
-  systemProperty 'orchestrator.artifactory.repositories', System.getProperty('orchestrator.artifactory.repositories')
 }
 
 test {

diff --git a/tests/build.gradle b/tests/build.gradle
index fc5da403ddbcab650c9b85b8e10a0dc03cb4e31d..5b51be10e1ef6bb4ba60cc764e31b63293fe005b 100644 (file)
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -92,8 +92,6 @@ task integrationTest(type: Test) {
   jacoco.enabled = false
 
   systemProperty 'orchestrator.configUrl', System.getProperty('orchestrator.configUrl')
-  systemProperty 'orchestrator.artifactory.apiKey', System.getProperty('orchestrator.artifactory.apiKey')
-  systemProperty 'orchestrator.artifactory.repositories', System.getProperty('orchestrator.artifactory.repositories')
   systemProperty 'sonar.runtimeVersion', System.getProperty('sonar.runtimeVersion')
 
   def category = System.getProperty('category')