jjb/jenkins-job-builder
Code Issues Proposed changes

Add 'readable-message' parameter to gerrit trigger

Browse Source 
Adds ability to keep base64 encoded gerrit trigger
variables (such as commit message) in human readable
format.

Change-Id: Ie96d633ab9dc96dacf859409fd649bd981f9eb7c
This commit is contained in:
Igor Belikov 2015-02-03 21:08:55 +03:00
parent 3ed77d9774
commit 91aab94c1b
10 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins_jobs/modules/triggers.py
View File

@ -357,6 +357,10 @@ def gerrit(parser, xml_parent, data):
parameters (default true)
:arg bool no-name-and-email: Do not pass compound 'name and email'
parameters (default false)
:arg bool readable-message: If parameters regarding multiline text,
e.g. commit message, should be as human readable or not. If false,
those parameters are Base64 encoded to keep environment variables
clean. (default false)
:arg bool dynamic-trigger-enabled: Enable/disable the dynamic trigger
(default false)
:arg str dynamic-trigger-url: if you specify this option, the Gerrit
@ -460,6 +464,8 @@ def gerrit(parser, xml_parent, data):
data.get('escape-quotes', True)).lower()
XML.SubElement(gtrig, 'noNameAndEmailParameters').text = str(
data.get('no-name-and-email', False)).lower()
XML.SubElement(gtrig, 'readableMessage').text = str(
data.get('readable-message', False)).lower()
XML.SubElement(gtrig, 'dynamicTriggerConfiguration').text = str(
data.get('dynamic-trigger-enabled', False))
XML.SubElement(gtrig, 'triggerConfigURL').text = str(

1
tests/triggers/fixtures/gerrit001.xml
View File

@ -30,6 +30,7 @@
<silentMode>false</silentMode>
<escapeQuotes>false</escapeQuotes>
<noNameAndEmailParameters>false</noNameAndEmailParameters>
<readableMessage>false</readableMessage>
<dynamicTriggerConfiguration>True</dynamicTriggerConfiguration>
<triggerConfigURL>http://myhost/mytrigger</triggerConfigURL>
<allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches>

1
tests/triggers/fixtures/gerrit002.xml
View File

@ -34,6 +34,7 @@
<silentMode>false</silentMode>
<escapeQuotes>false</escapeQuotes>
<noNameAndEmailParameters>false</noNameAndEmailParameters>
<readableMessage>false</readableMessage>
<dynamicTriggerConfiguration>True</dynamicTriggerConfiguration>
<triggerConfigURL>http://myhost/mytrigger</triggerConfigURL>
<allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches>

1
tests/triggers/fixtures/gerrit003.xml
View File

@ -50,6 +50,7 @@
<silentMode>false</silentMode>
<escapeQuotes>false</escapeQuotes>
<noNameAndEmailParameters>false</noNameAndEmailParameters>
<readableMessage>false</readableMessage>
<dynamicTriggerConfiguration>True</dynamicTriggerConfiguration>
<triggerConfigURL>http://myhost/mytrigger</triggerConfigURL>
<allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches>

1
tests/triggers/fixtures/gerrit004.xml
View File

@ -40,6 +40,7 @@
<silentMode>false</silentMode>
<escapeQuotes>false</escapeQuotes>
<noNameAndEmailParameters>false</noNameAndEmailParameters>
<readableMessage>false</readableMessage>
<dynamicTriggerConfiguration>True</dynamicTriggerConfiguration>
<triggerConfigURL>http://myhost/mytrigger</triggerConfigURL>
<allowTriggeringUnreviewedPatches>true</allowTriggeringUnreviewedPatches>

1
tests/triggers/fixtures/gerrit005.xml
View File

@ -30,6 +30,7 @@
<silentMode>false</silentMode>
<escapeQuotes>true</escapeQuotes>
<noNameAndEmailParameters>false</noNameAndEmailParameters>
<readableMessage>false</readableMessage>
<dynamicTriggerConfiguration>False</dynamicTriggerConfiguration>
<triggerConfigURL/>
<allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches>

1
tests/triggers/fixtures/gerrit006.xml
View File

@ -30,6 +30,7 @@
<silentMode>false</silentMode>
<escapeQuotes>false</escapeQuotes>
<noNameAndEmailParameters>false</noNameAndEmailParameters>
<readableMessage>true</readableMessage>
<dynamicTriggerConfiguration>True</dynamicTriggerConfiguration>
<triggerConfigURL>http://myhost/mytrigger</triggerConfigURL>
<allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches>

3
tests/triggers/fixtures/gerrit006.yaml
View File

@ -19,5 +19,6 @@ triggers:
silent: false
escape-quotes: false
no-name-and-email: false
readable-message: true
dynamic-trigger-enabled: true
dynamic-trigger-url: http://myhost/mytrigger
dynamic-trigger-url: http://myhost/mytrigger

1
tests/triggers/fixtures/gerrit007.xml
View File

@ -40,6 +40,7 @@
<silentMode>false</silentMode>
<escapeQuotes>false</escapeQuotes>
<noNameAndEmailParameters>false</noNameAndEmailParameters>
<readableMessage>false</readableMessage>
<dynamicTriggerConfiguration>True</dynamicTriggerConfiguration>
<triggerConfigURL>http://myhost/mytrigger</triggerConfigURL>
<allowTriggeringUnreviewedPatches>true</allowTriggeringUnreviewedPatches>

1
tests/yamlparser/fixtures/complete001.xml
View File

@ -73,6 +73,7 @@
<silentMode>false</silentMode>
<escapeQuotes>true</escapeQuotes>
<noNameAndEmailParameters>false</noNameAndEmailParameters>
<readableMessage>false</readableMessage>
<dynamicTriggerConfiguration>False</dynamicTriggerConfiguration>
<triggerConfigURL/>
<allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches>