Update sonar plugin

- Update to use convert_mapping_to_xml
- Add additional-arguments options
- Add plugin="sonar" attribute
- Update documentation such that options have defaults

This is part of my summer internship for ODL. The Jenkins job builder
project proposal document with a complete table of plugins that I have
worked on can be found below.

See:
https://docs.google.com/document/d/17AHluxqiBFcsTCkpyekDOFSTahX50pXFmQgjlK-PoEQ/edit

Change-Id: I1805586fb08c353a50b3d6536e9e26a977283df5
Signed-off-by: Kien Ha <kienha9922@gmail.com>
This commit is contained in:
Kien Ha 2016-06-23 12:34:28 -04:00
parent fda76531d9
commit 81843ba031
3 changed files with 18 additions and 9 deletions

View File

@ -2559,10 +2559,12 @@ def sonar(parser, xml_parent, data):
AnalyzingwiththeSonarQubeScanner>`_
:arg str sonar-name: Name of the Sonar installation.
:arg str task: Task to run. (optional)
:arg str project: Path to Sonar project properties file. (optional)
:arg str properties: Sonar configuration properties. (optional)
:arg str java-opts: Java options for Sonnar Runner. (optional)
:arg str task: Task to run. (default '')
:arg str project: Path to Sonar project properties file. (default '')
:arg str properties: Sonar configuration properties. (default '')
:arg str java-opts: Java options for Sonnar Runner. (default '')
:arg str additional-arguments: additional command line arguments
(default '')
:arg str jdk: JDK to use (inherited from the job if omitted). (optional)
Example:
@ -2572,11 +2574,16 @@ def sonar(parser, xml_parent, data):
"""
sonar = XML.SubElement(xml_parent,
'hudson.plugins.sonar.SonarRunnerBuilder')
sonar.set('plugin', 'sonar')
XML.SubElement(sonar, 'installationName').text = data['sonar-name']
XML.SubElement(sonar, 'task').text = data.get('task', '')
XML.SubElement(sonar, 'project').text = data.get('project', '')
XML.SubElement(sonar, 'properties').text = data.get('properties', '')
XML.SubElement(sonar, 'javaOpts').text = data.get('java-opts', '')
mappings = [
('task', 'task', ''),
('project', 'project', ''),
('properties', 'properties', ''),
('java-opts', 'javaOpts', ''),
('additional-arguments', 'additionalArguments', ''),
]
convert_mapping_to_xml(sonar, data, mappings, fail_required=True)
if 'jdk' in data:
XML.SubElement(sonar, 'jdk').text = data['jdk']

View File

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<project>
<builders>
<hudson.plugins.sonar.SonarRunnerBuilder>
<hudson.plugins.sonar.SonarRunnerBuilder plugin="sonar">
<installationName>Sonar</installationName>
<task>views</task>
<project>sonar-project.properties</project>
<properties>sonar.views.list=myview1,myview2</properties>
<javaOpts>-Xmx512m</javaOpts>
<additionalArguments>-X</additionalArguments>
</hudson.plugins.sonar.SonarRunnerBuilder>
</builders>
</project>

View File

@ -5,3 +5,4 @@ builders:
project: sonar-project.properties
properties: sonar.views.list=myview1,myview2
java-opts: -Xmx512m
additional-arguments: -X