[NO JIRA] Analyse SonarQube on NEXT

diff --git a/.travis/run_iris.sh b/.travis/run_iris.sh
index 14c6c81040a95ed6e3b31be4bc0f6fb266ea15b4..29b5a58fcb38b2bfc6e7d492231f493d4d0923ee 100755 (executable)
--- a/.travis/run_iris.sh
+++ b/.travis/run_iris.sh
@@ -23,7 +23,7 @@ java \
   -Diris.source.url=https://next.sonarqube.com/sonarqube \
   -Diris.source.token=$NEXT_TOKEN \
   -Diris.destination.projectKey=org.sonarsource.sonarqube:sonarqube \
-  -Diris.destination.url=$SONAR_HOST_URL \
-  -Diris.destination.token=$SONAR_TOKEN \
+  -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 676ee886aa62bc22b8e220c05ec8a3c4f07c6884..6e7cbdca7fb6999dfb11bbb82bc507c78d144f24 100755 (executable)
--- a/travis.sh
+++ b/travis.sh
@@ -37,19 +37,17 @@ git fetch --unshallow
 
 # 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 :server:sonar-web:yarn_validate-ci 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.host.url=https://next.sonarqube.com/sonarqube \
+      -Dsonar.login="$NEXT_TOKEN"
   else
     ./gradlew jacocoTestReport :server:sonar-web:yarn_validate-ci 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.host.url=https://next.sonarqube.com/sonarqube \
+      -Dsonar.login="$NEXT_TOKEN" \
       -Dsonar.branch.name="$TRAVIS_BRANCH"
   fi