From c83701151fbd853c65e7c1f955873670cda7333a Mon Sep 17 00:00:00 2001
From: L4168 <L4168@student.jamk.fi>
Date: Wed, 3 Jul 2019 11:37:00 +0300
Subject: [PATCH] changed scanner image
---
.gitlab-ci.yml | 19 ++++++++++++-------
sonar-project.properties | 1 -
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d43bb24..9b5e324 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,13 +43,18 @@ e2e-testing:
sonarqube:
stage: analysis
- image: jramcast/gitlab-ci-sonarqube
- tags: ['docker']
- only:
- - Development
+ image: ciricihq/gitlab-sonar-scanner
+ variables:
+ SONAR_URL: http://10.166.0.3:9000
+ SONAR_ANALYSIS_MODE: preview
+ script:
+ - gitlab-sonar-scanner -Dsonar.host.url=http://10.166.0.3:9000 -Dsonar.projectKey=backend -Dsonar.login=$SONAR_USER -Dsonar.password=$SONAR_PASS -Dsonar.gitlab.project_id=$CI_PROJECT_ID -Dsonar.gitlab.commit_sha=$CI_COMMIT_REF -Dsonar.gitlab.ref_name=$CI_COMMIT_REF_NAME
+
+sonarqube-reports:
+ stage: analysis
+ image: ciricihq/gitlab-sonar-scanner
variables:
SONAR_URL: http://10.166.0.3:9000
- SONAR_LOGIN: $SONAR_TOKEN
+ SONAR_ANALYSIS_MODE: publish
script:
- - sonar-scanner-preview
- - sonar-scanner
+ - gitlab-sonar-scanner -Dsonar.host.url=http://10.166.0.3:9000 -Dsonar.projectKey=backend -Dsonar.login=$SONAR_USER -Dsonar.password=$SONAR_PASS -Dsonar.gitlab.project_id=$CI_PROJECT_ID -Dsonar.gitlab.commit_sha=$CI_COMMIT_REF -Dsonar.gitlab.ref_name=$CI_COMMIT_REF_NAME
diff --git a/sonar-project.properties b/sonar-project.properties
index 767f2d1..ba1161b 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -2,4 +2,3 @@ sonar.projectKey=backend
sonar.projectName=OverflowBackend
sonar.projectVersion=1.0
sonar.sources=.
-sonar.analysis.mode=publish
--
GitLab