From c8a9ab9a4d83c05558ee1b2cb1bcb740abc8ea6f Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 3 Apr 2020 15:17:32 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=20so?=
 =?UTF-8?q?narScanner=20=D0=BD=D0=B0=20=D1=87=D1=82=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=B4=D0=B5=D1=84=D0=BE=D0=BB=D1=82=D0=BD=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vars/sonarScanner.groovy | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vars/sonarScanner.groovy b/vars/sonarScanner.groovy
index d63db18..2b3409d 100644
--- a/vars/sonarScanner.groovy
+++ b/vars/sonarScanner.groovy
@@ -1,11 +1,14 @@
 import com.cloudbees.groovy.cps.NonCPS
 import groovy.transform.Field
+import ru.pulsar.jenkins.library.configuration.JobConfiguration
 
 @Field def sonarCommand
 
 def call(String rootFile = 'src/cf/Configuration.xml') {
 
-    String scannerHome = tool 'sonar-scanner'
+    def config = jobConfiguration() as JobConfiguration
+
+    String scannerHome = tool config.sonarScannerToolName
     sonarCommand = "$scannerHome/bin/sonar-scanner -Dsonar.branch.name=$env.BRANCH_NAME"
 
     def configurationText = readFile encoding: 'UTF-8', file: rootFile