Преглед изворни кода

Fix configuration of Artifactory in QA tests (#400)

tags/7.5
Simon Brandhof пре 6 година
родитељ
комит
335cb65754
3 измењених фајлова са 2 додато и 4 уклоњено
  1. 2
    0
      build.gradle
  2. 0
    2
      server/sonar-db-core/build.gradle
  3. 0
    2
      tests/build.gradle

+ 2
- 0
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) {

+ 0
- 2
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 {

+ 0
- 2
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')

Loading…
Откажи
Сачувај