Skip to content

Commit 37f15dd

Browse files
authored
Merge pull request #49 from aml-org/W-17016391
W-17016391: Update sonarqube credentials for sfdc
2 parents 26bd957 + 564e663 commit 37f15dd

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/aml-org/amf-ci-tools-base-image:1.3.2
1+
FROM ghcr.io/aml-org/amf-ci-tools-base-image:1.3.4

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pipeline {
4747
}
4848
}
4949
steps {
50-
withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'sonarqube-official', passwordVariable: 'SONAR_SERVER_TOKEN', usernameVariable: 'SONAR_SERVER_URL']]) {
50+
withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'sf-sonarqube-official', passwordVariable: 'SONAR_SERVER_TOKEN', usernameVariable: 'SONAR_SERVER_URL']]) {
5151
script {
5252
lastStage = env.STAGE_NAME
5353
sh 'sbt -Dsonar.host.url=${SONAR_SERVER_URL} -Dsonar.login=${SONAR_SERVER_TOKEN} sonarScan'

build.sbt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,14 @@ lazy val branch = sys.env.getOrElse("BRANCH_NAME", "develop")
4141

4242
sonarProperties ++= Map(
4343
"sonar.login" -> sonarToken,
44-
"sonar.projectKey" -> "mulesoft.scala-common",
44+
"sonar.projectKey" -> "mulesoft.scala-common.gec",
4545
"sonar.projectName" -> "Scala-common",
4646
"sonar.projectVersion" -> version.value,
4747
"sonar.sourceEncoding" -> "UTF-8",
4848
"sonar.github.repository" -> "aml-org/scala-common",
4949
"sonar.branch.name" -> branch,
5050
"sonar.sources" -> "shared/src/main/scala",
5151
"sonar.tests" -> "shared/src/test/scala",
52-
"sonar.userHome" -> "${buildDir}/.sonar"
52+
"sonar.userHome" -> "${buildDir}/.sonar",
53+
"sonar.scala.coverage.reportPaths" -> "target/scala-2.12/scoverage-report/scoverage.xml"
5354
)

0 commit comments

Comments
 (0)