From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Tue, 19 Jun 2018 09:23:08 +0000 (+0200)
Subject: Fix configuration of Artifactory in QA tests (#400)
X-Git-Tag: 7.5~966
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=335cb657544f2c01b9efdc561b42534e8dc558ee;p=sonarqube.git

Fix configuration of Artifactory in QA tests (#400)
---

diff --git a/build.gradle b/build.gradle
index 2d2e2e90790..d6f9bcc62b2 100644
--- 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 df83a0aeaac..10a0e9f4718 100644
--- 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 fc5da403ddb..5b51be10e1e 100644
--- 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')