diff options
author | Adam Romanek <romanek.adam@gmail.com> | 2020-05-27 16:15:39 +0200 |
---|---|---|
committer | Adam Romanek <romanek.adam@gmail.com> | 2020-06-01 15:39:18 +0200 |
commit | b04ca3a82c27b93c904a1ffeef19d906417e6f24 (patch) | |
tree | 7f8088bc2ead0ac4317ac6162b35b5061e776ff2 | |
parent | 1ffef886f872dc74a5d6bb2dcc49e302f85018bb (diff) | |
download | python-jenkins-job-builder-b04ca3a82c27b93c904a1ffeef19d906417e6f24.tar.gz python-jenkins-job-builder-b04ca3a82c27b93c904a1ffeef19d906417e6f24.tar.xz python-jenkins-job-builder-b04ca3a82c27b93c904a1ffeef19d906417e6f24.zip |
Gerrit Trigger: update support to the latest plugin version
The changes include:
- deprecated the following options and made support for them dependent
on the Gerrit Trigger plugin version:
- 'no-name-and-email'
- 'readable-message'
- 'trigger-for-unreviewed-patches'
- added a set of new options:
- 'name-and-email-parameter-mode' (replaced 'no-name-and-email')
- 'commit-message-parameter-mode' (replaced 'readable-message')
- 'change-subject-parameter-mode'
- 'comment-text-parameter-mode'
all these options can have one of the following values:
- NONE
- PLAIN
- BASE64
the default value for the first two options is taken from the
respective options they replaced, if they exist in the input YAML
file, so the overall change should be backward compatible
- fixed the value generated for <dynamicTriggerConfiguration> element
it should be "true"/"false" instead of "True"/"False"
- added an empty <dynamicGerritProjects> element when dynamic trigger
functionality is disabled to match what the plugin does
With the above changes the markup generated by JJB is fully aligned with
Gerrit Trigger plugin v2.30.x. Tested on Gerrit Trigger plugin v2.30.0.
Task: 39871
Story: 2007722
Change-Id: I25800874f51a93a351926a9a1be255cce80b88bd
53 files changed, 875 insertions, 57 deletions
diff --git a/jenkins_jobs/modules/triggers.py b/jenkins_jobs/modules/triggers.py index 2f89b5c6..8421fd6b 100644 --- a/jenkins_jobs/modules/triggers.py +++ b/jenkins_jobs/modules/triggers.py @@ -240,6 +240,67 @@ def build_gerrit_skip_votes(xml_parent, data): XML.SubElement(skip_vote_node, tag_name).text = str(setting).lower() +def build_gerrit_parameter_modes(xml_parent, data, plugin_ver): + if plugin_ver < pkg_resources.parse_version("2.18.0"): + for parameter_name in ( + "commit-message", + "name-and-email", + "change-subject", + "comment-text", + ): + parameter_mode = "{}-parameter-mode".format(parameter_name) + if parameter_mode in data: + logger.warning( + "Gerrit Trigger property '{}' is not supported in this " + "plugin version".format(parameter_mode) + ) + + deprecated_mappings = ( + ("no-name-and-email", "noNameAndEmailParameters", False), + ("readable-message", "readableMessage", False), + ) + helpers.convert_mapping_to_xml( + xml_parent, data, deprecated_mappings, fail_required=True + ) + else: # version >= 2.18.0 + readable_message = data.get("readable-message") + if readable_message is not None: + logger.warning("Gerrit Trigger property 'readable-message' is deprecated") + no_name_and_email = data.get("no-name-and-email") + if no_name_and_email is not None: + logger.warning("Gerrit Trigger property 'no-name-and-email' is deprecated") + allowed_parameter_modes = ["NONE", "PLAIN", "BASE64"] + new_mappings = ( + ( + "commit-message-parameter-mode", + "commitMessageParameterMode", + "BASE64" if readable_message is not True else "PLAIN", + allowed_parameter_modes, + ), + ( + "name-and-email-parameter-mode", + "nameAndEmailParameterMode", + "PLAIN" if no_name_and_email is not True else "NONE", + allowed_parameter_modes, + ), + ( + "change-subject-parameter-mode", + "changeSubjectParameterMode", + "PLAIN", + allowed_parameter_modes, + ), + ( + "comment-text-parameter-mode", + "commentTextParameterMode", + "BASE64", + allowed_parameter_modes, + ), + ) + helpers.convert_mapping_to_xml( + xml_parent, data, new_mappings, fail_required=True + ) + + def gerrit(registry, xml_parent, data): """yaml: gerrit @@ -450,10 +511,42 @@ def gerrit(registry, xml_parent, data): parameters (default true) :arg bool no-name-and-email: Do not pass compound 'name and email' parameters (default false) + + .. deprecated:: 3.5.0 Please use `name-and-email-parameter-mode` + parameter. + :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) + + .. deprecated:: 3.5.0 Please use `commit-message-parameter-mode` + parameter. + + :arg str name-and-email-parameter-mode: The parameter mode for the compound + "name and email" parameters (like GERRIT_PATCHSET_UPLOADER or + GERRIT_CHANGE_OWNER). This can either be 'NONE' to avoid passing the + parameter all together, 'PLAIN' to pass the parameter in human readable + form, or 'BASE64' to pass the parameter in base64 encoded form (default + 'PLAIN'). Requires Gerrit Trigger Plugin version >= 2.18.0. + :arg str commit-message-parameter-mode: The parameter mode for the + GERRIT_CHANGE_COMMIT_MESSAGE parameter. This can either be 'NONE' to + avoid passing the parameter all together, 'PLAIN' to pass the parameter + in human readable form, or 'BASE64' to pass the parameter in base64 + encoded form (default 'BASE64'). Requires Gerrit Trigger Plugin version + >= 2.18.0. + :arg str change-subject-parameter-mode: The parameter mode for the + GERRIT_CHANGE_SUBJECT parameter. This can either be 'NONE' to avoid + passing the parameter all together, 'PLAIN' to pass the parameter in + human readable form, or 'BASE64' to pass the parameter in base64 + encoded form (default 'PLAIN'). Requires Gerrit Trigger Plugin version + >= 2.18.0. + :arg str comment-text-parameter-mode: The parameter mode for the + GERRIT_EVENT_COMMENT_TEXT parameter. This can either be 'NONE' to avoid + passing the parameter all together, 'PLAIN' to pass the parameter in + human readable form, or 'BASE64' to pass the parameter in base64 + encoded form (default 'BASE64'). Requires Gerrit Trigger Plugin version + >= 2.18.0. :arg str dependency-jobs: All jobs on which this job depends. If a commit should trigger both a dependency and this job, the dependency will be built first. Use commas to separate job names. Beware of cyclic @@ -469,7 +562,14 @@ def gerrit(registry, xml_parent, data): trigger configuration will be fetched from there on a regular interval :arg bool trigger-for-unreviewed-patches: trigger patchset-created events for changes that were uploaded while connection to Gerrit was down - (default false). Requires Gerrit Trigger Plugin version >= 2.11.0 + (default false). Requires Gerrit Trigger Plugin version >= 2.11.0. + + .. deprecated:: 3.5.0 Supported for Gerrit Trigger Plugin versions + < 2.14.0. See + `Missed Events Playback Feature <https://plugins.jenkins.io/ + gerrit-trigger#missed-events-playback-feature-available-from- + v-2-14-0>`_. + :arg str custom-url: Custom URL for a message sent to Gerrit. Build details URL will be used if empty. (default '') :arg str server-name: Name of the server to trigger on, or ''__ANY__'' to @@ -503,6 +603,11 @@ def gerrit(registry, xml_parent, data): gerrit_handle_legacy_configuration(data) + plugin_info = registry.get_plugin_info("Gerrit Trigger") + plugin_ver = pkg_resources.parse_version( + plugin_info.get("version", str(sys.maxsize)) + ) + projects = data.get("projects", []) gtrig = XML.SubElement( xml_parent, @@ -607,11 +712,10 @@ def gerrit(registry, xml_parent, data): ("silent", "silentMode", False), ("silent-start", "silentStartMode", False), ("escape-quotes", "escapeQuotes", True), - ("no-name-and-email", "noNameAndEmailParameters", False), - ("readable-message", "readableMessage", False), ("dependency-jobs", "dependencyJobsNames", ""), ] helpers.convert_mapping_to_xml(gtrig, data, general_mappings, fail_required=True) + build_gerrit_parameter_modes(gtrig, data, plugin_ver) notification_levels = ["NONE", "OWNER", "OWNER_REVIEWERS", "ALL", "SERVER_DEFAULT"] notification_level = data.get("notification-level", "SERVER_DEFAULT") if notification_level not in notification_levels: @@ -624,16 +728,26 @@ def gerrit(registry, xml_parent, data): XML.SubElement(gtrig, "notificationLevel").text = notification_level XML.SubElement(gtrig, "dynamicTriggerConfiguration").text = str( data.get("dynamic-trigger-enabled", False) - ) + ).lower() XML.SubElement(gtrig, "triggerConfigURL").text = str( data.get("dynamic-trigger-url", "") ) + if data.get("dynamic-trigger-enabled", False) is False: + XML.SubElement(gtrig, "dynamicGerritProjects").set("class", "empty-list") XML.SubElement(gtrig, "triggerInformationAction").text = str( data.get("trigger-information-action", "") ) - XML.SubElement(gtrig, "allowTriggeringUnreviewedPatches").text = str( - data.get("trigger-for-unreviewed-patches", False) - ).lower() + if (plugin_ver >= pkg_resources.parse_version("2.11.0")) and ( + plugin_ver < pkg_resources.parse_version("2.14.0") + ): + XML.SubElement(gtrig, "allowTriggeringUnreviewedPatches").text = str( + data.get("trigger-for-unreviewed-patches", False) + ).lower() + elif "trigger-for-unreviewed-patches" in data: + logger.warning( + "Gerrit Trigger property 'trigger-for-unreviewed-patches' is not " + "supported in this plugin version" + ) build_gerrit_triggers(gtrig, data) override = str(data.get("override-votes", False)).lower() if override == "true": diff --git a/tests/jsonparser/fixtures/complete001.xml b/tests/jsonparser/fixtures/complete001.xml index 355fac1a..17a54f72 100644 --- a/tests/jsonparser/fixtures/complete001.xml +++ b/tests/jsonparser/fixtures/complete001.xml @@ -68,14 +68,16 @@ <silentMode>false</silentMode> <silentStartMode>false</silentStartMode> <escapeQuotes>true</escapeQuotes> - <noNameAndEmailParameters>false</noNameAndEmailParameters> - <readableMessage>false</readableMessage> <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> <notificationLevel/> - <dynamicTriggerConfiguration>False</dynamicTriggerConfiguration> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> <triggerInformationAction/> - <allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches> <triggerOnEvents> <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent/> </triggerOnEvents> diff --git a/tests/triggers/fixtures/gerrit001.xml b/tests/triggers/fixtures/gerrit001.xml index 5a30fcb3..00774f20 100644 --- a/tests/triggers/fixtures/gerrit001.xml +++ b/tests/triggers/fixtures/gerrit001.xml @@ -31,14 +31,15 @@ <silentMode>false</silentMode> <silentStartMode>false</silentStartMode> <escapeQuotes>false</escapeQuotes> - <noNameAndEmailParameters>false</noNameAndEmailParameters> - <readableMessage>false</readableMessage> <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> <notificationLevel/> - <dynamicTriggerConfiguration>True</dynamicTriggerConfiguration> + <dynamicTriggerConfiguration>true</dynamicTriggerConfiguration> <triggerConfigURL>http://myhost/mytrigger</triggerConfigURL> <triggerInformationAction/> - <allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches> <triggerOnEvents> <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedEvent> <verdictCategory>APRV</verdictCategory> diff --git a/tests/triggers/fixtures/gerrit002.xml b/tests/triggers/fixtures/gerrit002.xml index d42eb2bb..f18e4fd7 100644 --- a/tests/triggers/fixtures/gerrit002.xml +++ b/tests/triggers/fixtures/gerrit002.xml @@ -35,14 +35,15 @@ <silentMode>false</silentMode> <silentStartMode>false</silentStartMode> <escapeQuotes>false</escapeQuotes> - <noNameAndEmailParameters>false</noNameAndEmailParameters> - <readableMessage>false</readableMessage> <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> <notificationLevel/> - <dynamicTriggerConfiguration>True</dynamicTriggerConfiguration> + <dynamicTriggerConfiguration>true</dynamicTriggerConfiguration> <triggerConfigURL>http://myhost/mytrigger</triggerConfigURL> <triggerInformationAction/> - <allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches> <triggerOnEvents> <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedEvent> <verdictCategory>APRV</verdictCategory> diff --git a/tests/triggers/fixtures/gerrit003.xml b/tests/triggers/fixtures/gerrit003.xml index 55ef0e6f..32d55b85 100644 --- a/tests/triggers/fixtures/gerrit003.xml +++ b/tests/triggers/fixtures/gerrit003.xml @@ -52,14 +52,15 @@ <silentMode>false</silentMode> <silentStartMode>false</silentStartMode> <escapeQuotes>false</escapeQuotes> - <noNameAndEmailParameters>false</noNameAndEmailParameters> - <readableMessage>false</readableMessage> <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> <notificationLevel/> - <dynamicTriggerConfiguration>True</dynamicTriggerConfiguration> + <dynamicTriggerConfiguration>true</dynamicTriggerConfiguration> <triggerConfigURL>http://myhost/mytrigger</triggerConfigURL> <triggerInformationAction/> - <allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches> <triggerOnEvents> <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedEvent> <verdictCategory>APRV</verdictCategory> diff --git a/tests/triggers/fixtures/gerrit004.xml b/tests/triggers/fixtures/gerrit004.xml index 4afca1cd..b7c5dd8b 100644 --- a/tests/triggers/fixtures/gerrit004.xml +++ b/tests/triggers/fixtures/gerrit004.xml @@ -41,14 +41,15 @@ <silentMode>false</silentMode> <silentStartMode>true</silentStartMode> <escapeQuotes>false</escapeQuotes> - <noNameAndEmailParameters>false</noNameAndEmailParameters> - <readableMessage>false</readableMessage> <dependencyJobsNames>job1, job2</dependencyJobsNames> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> <notificationLevel>ALL</notificationLevel> - <dynamicTriggerConfiguration>True</dynamicTriggerConfiguration> + <dynamicTriggerConfiguration>true</dynamicTriggerConfiguration> <triggerConfigURL>http://myhost/mytrigger</triggerConfigURL> <triggerInformationAction/> - <allowTriggeringUnreviewedPatches>true</allowTriggeringUnreviewedPatches> <triggerOnEvents> <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent> <excludeDrafts>true</excludeDrafts> diff --git a/tests/triggers/fixtures/gerrit004.yaml b/tests/triggers/fixtures/gerrit004.yaml index df64b592..d890d57f 100644 --- a/tests/triggers/fixtures/gerrit004.yaml +++ b/tests/triggers/fixtures/gerrit004.yaml @@ -32,11 +32,10 @@ triggers: silent: false silent-start: true escape-quotes: false - no-name-and-email: false dependency-jobs: 'job1, job2' + name-and-email-parameter-mode: PLAIN notification-level: ALL dynamic-trigger-enabled: true dynamic-trigger-url: http://myhost/mytrigger - trigger-for-unreviewed-patches: true server-name: my-server failure-message-file: path/to/filename diff --git a/tests/triggers/fixtures/gerrit005.xml b/tests/triggers/fixtures/gerrit005.xml index bb719e43..05a179da 100644 --- a/tests/triggers/fixtures/gerrit005.xml +++ b/tests/triggers/fixtures/gerrit005.xml @@ -31,14 +31,16 @@ <silentMode>false</silentMode> <silentStartMode>false</silentStartMode> <escapeQuotes>true</escapeQuotes> - <noNameAndEmailParameters>false</noNameAndEmailParameters> - <readableMessage>false</readableMessage> <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> <notificationLevel/> - <dynamicTriggerConfiguration>False</dynamicTriggerConfiguration> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> <triggerInformationAction/> - <allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches> <triggerOnEvents> <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedEvent> <verdictCategory>APRV</verdictCategory> diff --git a/tests/triggers/fixtures/gerrit006.xml b/tests/triggers/fixtures/gerrit006.xml index 30a9e5c3..26ecccee 100644 --- a/tests/triggers/fixtures/gerrit006.xml +++ b/tests/triggers/fixtures/gerrit006.xml @@ -31,14 +31,15 @@ <silentMode>false</silentMode> <silentStartMode>false</silentStartMode> <escapeQuotes>false</escapeQuotes> - <noNameAndEmailParameters>false</noNameAndEmailParameters> - <readableMessage>true</readableMessage> <dependencyJobsNames/> + <commitMessageParameterMode>PLAIN</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> <notificationLevel/> - <dynamicTriggerConfiguration>True</dynamicTriggerConfiguration> + <dynamicTriggerConfiguration>true</dynamicTriggerConfiguration> <triggerConfigURL>http://myhost/mytrigger</triggerConfigURL> <triggerInformationAction/> - <allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches> <triggerOnEvents> <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedContainsEvent> <commentAddedCommentContains>recheck</commentAddedCommentContains> diff --git a/tests/triggers/fixtures/gerrit007.xml b/tests/triggers/fixtures/gerrit007.xml index 821186ea..8c673fd0 100644 --- a/tests/triggers/fixtures/gerrit007.xml +++ b/tests/triggers/fixtures/gerrit007.xml @@ -41,14 +41,15 @@ <silentMode>false</silentMode> <silentStartMode>false</silentStartMode> <escapeQuotes>false</escapeQuotes> - <noNameAndEmailParameters>false</noNameAndEmailParameters> - <readableMessage>false</readableMessage> <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> <notificationLevel/> - <dynamicTriggerConfiguration>True</dynamicTriggerConfiguration> + <dynamicTriggerConfiguration>true</dynamicTriggerConfiguration> <triggerConfigURL>http://myhost/mytrigger</triggerConfigURL> <triggerInformationAction/> - <allowTriggeringUnreviewedPatches>true</allowTriggeringUnreviewedPatches> <triggerOnEvents> <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent/> <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedEvent> diff --git a/tests/triggers/fixtures/gerrit008.xml b/tests/triggers/fixtures/gerrit008.xml index d1761489..2639bd70 100644 --- a/tests/triggers/fixtures/gerrit008.xml +++ b/tests/triggers/fixtures/gerrit008.xml @@ -47,14 +47,15 @@ <silentMode>false</silentMode> <silentStartMode>true</silentStartMode> <escapeQuotes>false</escapeQuotes> - <noNameAndEmailParameters>false</noNameAndEmailParameters> - <readableMessage>false</readableMessage> <dependencyJobsNames>job1, job2</dependencyJobsNames> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> <notificationLevel>ALL</notificationLevel> - <dynamicTriggerConfiguration>True</dynamicTriggerConfiguration> + <dynamicTriggerConfiguration>true</dynamicTriggerConfiguration> <triggerConfigURL>http://myhost/mytrigger</triggerConfigURL> <triggerInformationAction/> - <allowTriggeringUnreviewedPatches>true</allowTriggeringUnreviewedPatches> <triggerOnEvents> <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent> <excludeDrafts>true</excludeDrafts> diff --git a/tests/triggers/fixtures/gerrit009.xml b/tests/triggers/fixtures/gerrit009.xml index 8abc6e43..cc87f5e2 100644 --- a/tests/triggers/fixtures/gerrit009.xml +++ b/tests/triggers/fixtures/gerrit009.xml @@ -13,14 +13,15 @@ <silentMode>false</silentMode> <silentStartMode>false</silentStartMode> <escapeQuotes>true</escapeQuotes> - <noNameAndEmailParameters>false</noNameAndEmailParameters> - <readableMessage>false</readableMessage> <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> <notificationLevel/> - <dynamicTriggerConfiguration>True</dynamicTriggerConfiguration> + <dynamicTriggerConfiguration>true</dynamicTriggerConfiguration> <triggerConfigURL>http://myhost/mytrigger</triggerConfigURL> <triggerInformationAction/> - <allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches> <triggerOnEvents> <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedEvent> <verdictCategory>APRV</verdictCategory> diff --git a/tests/triggers/fixtures/gerrit010.xml b/tests/triggers/fixtures/gerrit010.xml index c9cc2499..78d66b4a 100644 --- a/tests/triggers/fixtures/gerrit010.xml +++ b/tests/triggers/fixtures/gerrit010.xml @@ -31,14 +31,15 @@ <silentMode>false</silentMode> <silentStartMode>false</silentStartMode> <escapeQuotes>false</escapeQuotes> - <noNameAndEmailParameters>false</noNameAndEmailParameters> - <readableMessage>false</readableMessage> <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> <notificationLevel/> - <dynamicTriggerConfiguration>True</dynamicTriggerConfiguration> + <dynamicTriggerConfiguration>true</dynamicTriggerConfiguration> <triggerConfigURL>http://myhost/mytrigger</triggerConfigURL> <triggerInformationAction/> - <allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches> <triggerOnEvents> <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedEvent> <verdictCategory>APRV</verdictCategory> diff --git a/tests/triggers/fixtures/gerrit011-name-and-email-parameter-mode-base64.xml b/tests/triggers/fixtures/gerrit011-name-and-email-parameter-mode-base64.xml new file mode 100644 index 00000000..a52b428e --- /dev/null +++ b/tests/triggers/fixtures/gerrit011-name-and-email-parameter-mode-base64.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>BASE64</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit011-name-and-email-parameter-mode-base64.yaml b/tests/triggers/fixtures/gerrit011-name-and-email-parameter-mode-base64.yaml new file mode 100644 index 00000000..052da2cf --- /dev/null +++ b/tests/triggers/fixtures/gerrit011-name-and-email-parameter-mode-base64.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + name-and-email-parameter-mode: BASE64 diff --git a/tests/triggers/fixtures/gerrit012-name-and-email-parameter-mode-none.xml b/tests/triggers/fixtures/gerrit012-name-and-email-parameter-mode-none.xml new file mode 100644 index 00000000..3e5af26f --- /dev/null +++ b/tests/triggers/fixtures/gerrit012-name-and-email-parameter-mode-none.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>NONE</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit012-name-and-email-parameter-mode-none.yaml b/tests/triggers/fixtures/gerrit012-name-and-email-parameter-mode-none.yaml new file mode 100644 index 00000000..1f589cd6 --- /dev/null +++ b/tests/triggers/fixtures/gerrit012-name-and-email-parameter-mode-none.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + name-and-email-parameter-mode: NONE diff --git a/tests/triggers/fixtures/gerrit013-name-and-email-parameter-mode-plain.xml b/tests/triggers/fixtures/gerrit013-name-and-email-parameter-mode-plain.xml new file mode 100644 index 00000000..168ecdb6 --- /dev/null +++ b/tests/triggers/fixtures/gerrit013-name-and-email-parameter-mode-plain.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit013-name-and-email-parameter-mode-plain.yaml b/tests/triggers/fixtures/gerrit013-name-and-email-parameter-mode-plain.yaml new file mode 100644 index 00000000..f10f5dfe --- /dev/null +++ b/tests/triggers/fixtures/gerrit013-name-and-email-parameter-mode-plain.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + name-and-email-parameter-mode: PLAIN diff --git a/tests/triggers/fixtures/gerrit014-commit-message-parameter-mode-base64.xml b/tests/triggers/fixtures/gerrit014-commit-message-parameter-mode-base64.xml new file mode 100644 index 00000000..168ecdb6 --- /dev/null +++ b/tests/triggers/fixtures/gerrit014-commit-message-parameter-mode-base64.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit014-commit-message-parameter-mode-base64.yaml b/tests/triggers/fixtures/gerrit014-commit-message-parameter-mode-base64.yaml new file mode 100644 index 00000000..afc29a4b --- /dev/null +++ b/tests/triggers/fixtures/gerrit014-commit-message-parameter-mode-base64.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + commit-message-parameter-mode: BASE64 diff --git a/tests/triggers/fixtures/gerrit015-commit-message-parameter-mode-plain.xml b/tests/triggers/fixtures/gerrit015-commit-message-parameter-mode-plain.xml new file mode 100644 index 00000000..aca3e5b3 --- /dev/null +++ b/tests/triggers/fixtures/gerrit015-commit-message-parameter-mode-plain.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <commitMessageParameterMode>PLAIN</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit015-commit-message-parameter-mode-plain.yaml b/tests/triggers/fixtures/gerrit015-commit-message-parameter-mode-plain.yaml new file mode 100644 index 00000000..b3f8df2f --- /dev/null +++ b/tests/triggers/fixtures/gerrit015-commit-message-parameter-mode-plain.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + commit-message-parameter-mode: PLAIN diff --git a/tests/triggers/fixtures/gerrit016-commit-message-parameter-mode-none.xml b/tests/triggers/fixtures/gerrit016-commit-message-parameter-mode-none.xml new file mode 100644 index 00000000..585b758a --- /dev/null +++ b/tests/triggers/fixtures/gerrit016-commit-message-parameter-mode-none.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <commitMessageParameterMode>NONE</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit016-commit-message-parameter-mode-none.yaml b/tests/triggers/fixtures/gerrit016-commit-message-parameter-mode-none.yaml new file mode 100644 index 00000000..fb903541 --- /dev/null +++ b/tests/triggers/fixtures/gerrit016-commit-message-parameter-mode-none.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + commit-message-parameter-mode: NONE diff --git a/tests/triggers/fixtures/gerrit017-change-subject-parameter-mode-base64.xml b/tests/triggers/fixtures/gerrit017-change-subject-parameter-mode-base64.xml new file mode 100644 index 00000000..afb1fc2e --- /dev/null +++ b/tests/triggers/fixtures/gerrit017-change-subject-parameter-mode-base64.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>BASE64</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit017-change-subject-parameter-mode-base64.yaml b/tests/triggers/fixtures/gerrit017-change-subject-parameter-mode-base64.yaml new file mode 100644 index 00000000..89f9649f --- /dev/null +++ b/tests/triggers/fixtures/gerrit017-change-subject-parameter-mode-base64.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + change-subject-parameter-mode: BASE64 diff --git a/tests/triggers/fixtures/gerrit018-change-subject-parameter-mode-plain.xml b/tests/triggers/fixtures/gerrit018-change-subject-parameter-mode-plain.xml new file mode 100644 index 00000000..168ecdb6 --- /dev/null +++ b/tests/triggers/fixtures/gerrit018-change-subject-parameter-mode-plain.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit018-change-subject-parameter-mode-plain.yaml b/tests/triggers/fixtures/gerrit018-change-subject-parameter-mode-plain.yaml new file mode 100644 index 00000000..4db9e31c --- /dev/null +++ b/tests/triggers/fixtures/gerrit018-change-subject-parameter-mode-plain.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + change-subject-parameter-mode: PLAIN diff --git a/tests/triggers/fixtures/gerrit019-change-subject-parameter-mode-none.xml b/tests/triggers/fixtures/gerrit019-change-subject-parameter-mode-none.xml new file mode 100644 index 00000000..06483bd2 --- /dev/null +++ b/tests/triggers/fixtures/gerrit019-change-subject-parameter-mode-none.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>NONE</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit019-change-subject-parameter-mode-none.yaml b/tests/triggers/fixtures/gerrit019-change-subject-parameter-mode-none.yaml new file mode 100644 index 00000000..876f7aaa --- /dev/null +++ b/tests/triggers/fixtures/gerrit019-change-subject-parameter-mode-none.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + change-subject-parameter-mode: NONE diff --git a/tests/triggers/fixtures/gerrit020-comment-text-parameter-mode-base64.xml b/tests/triggers/fixtures/gerrit020-comment-text-parameter-mode-base64.xml new file mode 100644 index 00000000..168ecdb6 --- /dev/null +++ b/tests/triggers/fixtures/gerrit020-comment-text-parameter-mode-base64.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit020-comment-text-parameter-mode-base64.yaml b/tests/triggers/fixtures/gerrit020-comment-text-parameter-mode-base64.yaml new file mode 100644 index 00000000..097c0648 --- /dev/null +++ b/tests/triggers/fixtures/gerrit020-comment-text-parameter-mode-base64.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + comment-text-parameter-mode: BASE64 diff --git a/tests/triggers/fixtures/gerrit021-comment-text-parameter-mode-plain.xml b/tests/triggers/fixtures/gerrit021-comment-text-parameter-mode-plain.xml new file mode 100644 index 00000000..25b079f3 --- /dev/null +++ b/tests/triggers/fixtures/gerrit021-comment-text-parameter-mode-plain.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>PLAIN</commentTextParameterMode> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit021-comment-text-parameter-mode-plain.yaml b/tests/triggers/fixtures/gerrit021-comment-text-parameter-mode-plain.yaml new file mode 100644 index 00000000..37ac319d --- /dev/null +++ b/tests/triggers/fixtures/gerrit021-comment-text-parameter-mode-plain.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + comment-text-parameter-mode: PLAIN diff --git a/tests/triggers/fixtures/gerrit022-comment-text-parameter-mode-none.xml b/tests/triggers/fixtures/gerrit022-comment-text-parameter-mode-none.xml new file mode 100644 index 00000000..22a02bd2 --- /dev/null +++ b/tests/triggers/fixtures/gerrit022-comment-text-parameter-mode-none.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>NONE</commentTextParameterMode> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit022-comment-text-parameter-mode-none.yaml b/tests/triggers/fixtures/gerrit022-comment-text-parameter-mode-none.yaml new file mode 100644 index 00000000..867ee90b --- /dev/null +++ b/tests/triggers/fixtures/gerrit022-comment-text-parameter-mode-none.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + comment-text-parameter-mode: NONE diff --git a/tests/triggers/fixtures/gerrit023-no-name-and-email-lt-2.18.plugins_info.yaml b/tests/triggers/fixtures/gerrit023-no-name-and-email-lt-2.18.plugins_info.yaml new file mode 100644 index 00000000..a19595b4 --- /dev/null +++ b/tests/triggers/fixtures/gerrit023-no-name-and-email-lt-2.18.plugins_info.yaml @@ -0,0 +1,3 @@ +- longName: 'Gerrit Trigger' + shortName: 'gerrit-trigger' + version: '2.17.0' diff --git a/tests/triggers/fixtures/gerrit023-no-name-and-email-lt-2.18.xml b/tests/triggers/fixtures/gerrit023-no-name-and-email-lt-2.18.xml new file mode 100644 index 00000000..ecd8a3a7 --- /dev/null +++ b/tests/triggers/fixtures/gerrit023-no-name-and-email-lt-2.18.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <noNameAndEmailParameters>true</noNameAndEmailParameters> + <readableMessage>false</readableMessage> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit023-no-name-and-email-lt-2.18.yaml b/tests/triggers/fixtures/gerrit023-no-name-and-email-lt-2.18.yaml new file mode 100644 index 00000000..cd08b8c9 --- /dev/null +++ b/tests/triggers/fixtures/gerrit023-no-name-and-email-lt-2.18.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + no-name-and-email: true diff --git a/tests/triggers/fixtures/gerrit024-no-name-and-email-ge-2.18.plugins_info.yaml b/tests/triggers/fixtures/gerrit024-no-name-and-email-ge-2.18.plugins_info.yaml new file mode 100644 index 00000000..7515655f --- /dev/null +++ b/tests/triggers/fixtures/gerrit024-no-name-and-email-ge-2.18.plugins_info.yaml @@ -0,0 +1,3 @@ +- longName: 'Gerrit Trigger' + shortName: 'gerrit-trigger' + version: '2.18.0' diff --git a/tests/triggers/fixtures/gerrit024-no-name-and-email-ge-2.18.xml b/tests/triggers/fixtures/gerrit024-no-name-and-email-ge-2.18.xml new file mode 100644 index 00000000..3e5af26f --- /dev/null +++ b/tests/triggers/fixtures/gerrit024-no-name-and-email-ge-2.18.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>NONE</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit024-no-name-and-email-ge-2.18.yaml b/tests/triggers/fixtures/gerrit024-no-name-and-email-ge-2.18.yaml new file mode 100644 index 00000000..cd08b8c9 --- /dev/null +++ b/tests/triggers/fixtures/gerrit024-no-name-and-email-ge-2.18.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + no-name-and-email: true diff --git a/tests/triggers/fixtures/gerrit025-readable-message-lt-2.18.plugins_info.yaml b/tests/triggers/fixtures/gerrit025-readable-message-lt-2.18.plugins_info.yaml new file mode 100644 index 00000000..a19595b4 --- /dev/null +++ b/tests/triggers/fixtures/gerrit025-readable-message-lt-2.18.plugins_info.yaml @@ -0,0 +1,3 @@ +- longName: 'Gerrit Trigger' + shortName: 'gerrit-trigger' + version: '2.17.0' diff --git a/tests/triggers/fixtures/gerrit025-readable-message-lt-2.18.xml b/tests/triggers/fixtures/gerrit025-readable-message-lt-2.18.xml new file mode 100644 index 00000000..c7af0d18 --- /dev/null +++ b/tests/triggers/fixtures/gerrit025-readable-message-lt-2.18.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <noNameAndEmailParameters>false</noNameAndEmailParameters> + <readableMessage>true</readableMessage> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit025-readable-message-lt-2.18.yaml b/tests/triggers/fixtures/gerrit025-readable-message-lt-2.18.yaml new file mode 100644 index 00000000..6fb173e8 --- /dev/null +++ b/tests/triggers/fixtures/gerrit025-readable-message-lt-2.18.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + readable-message: true diff --git a/tests/triggers/fixtures/gerrit026-readable-message-ge-2.18.plugins_info.yaml b/tests/triggers/fixtures/gerrit026-readable-message-ge-2.18.plugins_info.yaml new file mode 100644 index 00000000..7515655f --- /dev/null +++ b/tests/triggers/fixtures/gerrit026-readable-message-ge-2.18.plugins_info.yaml @@ -0,0 +1,3 @@ +- longName: 'Gerrit Trigger' + shortName: 'gerrit-trigger' + version: '2.18.0' diff --git a/tests/triggers/fixtures/gerrit026-readable-message-ge-2.18.xml b/tests/triggers/fixtures/gerrit026-readable-message-ge-2.18.xml new file mode 100644 index 00000000..aca3e5b3 --- /dev/null +++ b/tests/triggers/fixtures/gerrit026-readable-message-ge-2.18.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <commitMessageParameterMode>PLAIN</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit026-readable-message-ge-2.18.yaml b/tests/triggers/fixtures/gerrit026-readable-message-ge-2.18.yaml new file mode 100644 index 00000000..6fb173e8 --- /dev/null +++ b/tests/triggers/fixtures/gerrit026-readable-message-ge-2.18.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + readable-message: true diff --git a/tests/triggers/fixtures/gerrit027-trigger-for-unreviewed-patches.plugins_info.yaml b/tests/triggers/fixtures/gerrit027-trigger-for-unreviewed-patches.plugins_info.yaml new file mode 100644 index 00000000..c4e8764f --- /dev/null +++ b/tests/triggers/fixtures/gerrit027-trigger-for-unreviewed-patches.plugins_info.yaml @@ -0,0 +1,3 @@ +- longName: 'Gerrit Trigger' + shortName: 'gerrit-trigger' + version: '2.13.0' diff --git a/tests/triggers/fixtures/gerrit027-trigger-for-unreviewed-patches.xml b/tests/triggers/fixtures/gerrit027-trigger-for-unreviewed-patches.xml new file mode 100644 index 00000000..8b26014c --- /dev/null +++ b/tests/triggers/fixtures/gerrit027-trigger-for-unreviewed-patches.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + <spec/> + <gerritProjects/> + <skipVote> + <onSuccessful>false</onSuccessful> + <onFailed>false</onFailed> + <onUnstable>false</onUnstable> + <onNotBuilt>false</onNotBuilt> + </skipVote> + <silentMode>false</silentMode> + <silentStartMode>false</silentStartMode> + <escapeQuotes>true</escapeQuotes> + <dependencyJobsNames/> + <noNameAndEmailParameters>false</noNameAndEmailParameters> + <readableMessage>false</readableMessage> + <notificationLevel/> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> + <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> + <triggerInformationAction/> + <allowTriggeringUnreviewedPatches>true</allowTriggeringUnreviewedPatches> + <triggerOnEvents/> + <buildStartMessage/> + <buildFailureMessage/> + <buildSuccessfulMessage/> + <buildUnstableMessage/> + <buildNotBuiltMessage/> + <buildUnsuccessfulFilepath/> + <customUrl/> + <serverName>__ANY__</serverName> + </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/gerrit027-trigger-for-unreviewed-patches.yaml b/tests/triggers/fixtures/gerrit027-trigger-for-unreviewed-patches.yaml new file mode 100644 index 00000000..4b1238ff --- /dev/null +++ b/tests/triggers/fixtures/gerrit027-trigger-for-unreviewed-patches.yaml @@ -0,0 +1,3 @@ +triggers: + - gerrit: + trigger-for-unreviewed-patches: true diff --git a/tests/yamlparser/fixtures/complete001.xml b/tests/yamlparser/fixtures/complete001.xml index 546fd5e6..ef15abeb 100644 --- a/tests/yamlparser/fixtures/complete001.xml +++ b/tests/yamlparser/fixtures/complete001.xml @@ -69,14 +69,16 @@ <silentMode>false</silentMode> <silentStartMode>false</silentStartMode> <escapeQuotes>true</escapeQuotes> - <noNameAndEmailParameters>false</noNameAndEmailParameters> - <readableMessage>false</readableMessage> <dependencyJobsNames/> + <commitMessageParameterMode>BASE64</commitMessageParameterMode> + <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode> + <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode> + <commentTextParameterMode>BASE64</commentTextParameterMode> <notificationLevel/> - <dynamicTriggerConfiguration>False</dynamicTriggerConfiguration> + <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration> <triggerConfigURL/> + <dynamicGerritProjects class="empty-list"/> <triggerInformationAction/> - <allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches> <triggerOnEvents> <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent/> </triggerOnEvents> |