From 2e77650a4e2bfe0421f1ff65d7baf856e61ae098 Mon Sep 17 00:00:00 2001
From: Brett Delle Grazie <brett.dellegrazie@gmail.com>
Date: Wed, 20 Sep 2017 09:19:48 +0100
Subject: [PATCH] Sonar: Support sonar-scanner tag builder task (master)

Without this, a scanner cannot be selected

Task: 5711
Story: 2001206
Change-Id: I780596ce7f42019132b6c6c2bda9d0fdbd688f32
---
 jenkins_jobs/modules/builders.py   | 2 ++
 tests/builders/fixtures/sonar.xml  | 1 +
 tests/builders/fixtures/sonar.yaml | 1 +
 3 files changed, 4 insertions(+)

diff --git a/jenkins_jobs/modules/builders.py b/jenkins_jobs/modules/builders.py
index 8c0ed88fd..729d93e0a 100644
--- a/jenkins_jobs/modules/builders.py
+++ b/jenkins_jobs/modules/builders.py
@@ -2979,6 +2979,7 @@ def sonar(registry, xml_parent, data):
         AnalyzingwiththeSonarQubeScanner>`_
 
     :arg str sonar-name: Name of the Sonar installation.
+    :arg str sonar-scanner: Name of the Sonar Scanner.
     :arg str task: Task to run. (default '')
     :arg str project: Path to Sonar project properties file. (default '')
     :arg str properties: Sonar configuration properties. (default '')
@@ -2997,6 +2998,7 @@ def sonar(registry, xml_parent, data):
     sonar.set('plugin', 'sonar')
     XML.SubElement(sonar, 'installationName').text = data['sonar-name']
     mappings = [
+        ('scanner-name', 'sonarScannerName', ''),
         ('task', 'task', ''),
         ('project', 'project', ''),
         ('properties', 'properties', ''),
diff --git a/tests/builders/fixtures/sonar.xml b/tests/builders/fixtures/sonar.xml
index a1d05575f..44108bb11 100644
--- a/tests/builders/fixtures/sonar.xml
+++ b/tests/builders/fixtures/sonar.xml
@@ -3,6 +3,7 @@
   <builders>
     <hudson.plugins.sonar.SonarRunnerBuilder plugin="sonar">
       <installationName>Sonar</installationName>
+      <sonarScannerName>scanner-3.x</sonarScannerName>
       <task>views</task>
       <project>sonar-project.properties</project>
       <properties>sonar.views.list=myview1,myview2</properties>
diff --git a/tests/builders/fixtures/sonar.yaml b/tests/builders/fixtures/sonar.yaml
index 67c7a3b41..b8f0eed82 100644
--- a/tests/builders/fixtures/sonar.yaml
+++ b/tests/builders/fixtures/sonar.yaml
@@ -1,6 +1,7 @@
 builders:
   - sonar:
       sonar-name: Sonar
+      scanner-name: scanner-3.x
       task: views
       project: sonar-project.properties
       properties: sonar.views.list=myview1,myview2