From 26869a8c71c25e368fba97dee7dba4b58a99f515 Mon Sep 17 00:00:00 2001 From: Philippe Perrin Date: Fri, 25 Feb 2022 15:02:01 +0100 Subject: [PATCH] [NO JIRA] Analyse SonarQube on NEXT --- .travis/run_iris.sh | 8 +++++--- travis.sh | 16 +++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis/run_iris.sh b/.travis/run_iris.sh index 0ea8cc7476f..d08dec56483 100755 --- a/.travis/run_iris.sh +++ b/.travis/run_iris.sh @@ -18,10 +18,12 @@ else echo "Downloaded $VERSION" fi -java -Diris.projectKey=org.sonarsource.sonarqube:sonarqube \ +java \ + -Diris.source.projectKey=org.sonarsource.sonarqube:sonarqube-private \ -Diris.source.url=https://next.sonarqube.com/sonarqube \ -Diris.source.token=$NEXT_TOKEN \ - -Diris.destination.url=$SONAR_HOST_URL \ - -Diris.destination.token=$SONAR_TOKEN \ + -Diris.destination.projectKey=sonarqube \ + -Diris.destination.url=https://next.sonarqube.com/sonarqube \ + -Diris.destination.token=$NEXT_TOKEN \ -Diris.maxcountposts=50 \ -jar iris-\[RELEASE\]-jar-with-dependencies.jar diff --git a/travis.sh b/travis.sh index 2f63ca1b30f..a5eac387930 100755 --- a/travis.sh +++ b/travis.sh @@ -40,19 +40,17 @@ BUILD) # the '-' at the end is needed when using set -u (the 'nounset' flag) # see https://stackoverflow.com/a/9824943/641955 - if [[ -n "${SONAR_TOKEN-}" ]]; then + if [[ -n "${NEXT_TOKEN-}" ]]; then if [[ "${TRAVIS_BRANCH}" == "master" ]]; then ./gradlew jacocoTestReport sonarqube --info --no-daemon --console plain \ - -Dsonar.projectKey=org.sonarsource.sonarqube:sonarqube \ - -Dsonar.organization=sonarsource \ - -Dsonar.host.url=https://sonarcloud.io \ - -Dsonar.login="$SONAR_TOKEN" + -Dsonar.projectKey=sonarqube \ + -Dsonar.host.url=https://next.sonarqube.com/sonarqube \ + -Dsonar.login="$NEXT_TOKEN" else ./gradlew jacocoTestReport sonarqube --info --no-daemon --console plain \ - -Dsonar.projectKey=org.sonarsource.sonarqube:sonarqube \ - -Dsonar.organization=sonarsource \ - -Dsonar.host.url=https://sonarcloud.io \ - -Dsonar.login="$SONAR_TOKEN" \ + -Dsonar.projectKey=sonarqube \ + -Dsonar.host.url=https://next.sonarqube.com/sonarqube \ + -Dsonar.login="$NEXT_TOKEN" \ -Dsonar.branch.name="$TRAVIS_BRANCH" fi -- 2.39.5