[Triggers] Update helpers import to common style
Change-Id: Ic9f6791ab7b701e160a7d8b8ff20fe0615d222a4 Signed-off-by: Thanh Ha <zxiiro@linux.com>
This commit is contained in:
parent
3b777009f3
commit
059fd49f3d
|
@ -42,7 +42,7 @@ from jenkins_jobs.errors import JenkinsJobsException
|
||||||
from jenkins_jobs.errors import MissingAttributeError
|
from jenkins_jobs.errors import MissingAttributeError
|
||||||
import jenkins_jobs.modules.base
|
import jenkins_jobs.modules.base
|
||||||
from jenkins_jobs.modules import hudson_model
|
from jenkins_jobs.modules import hudson_model
|
||||||
from jenkins_jobs.modules.helpers import convert_mapping_to_xml
|
import jenkins_jobs.modules.helpers as helpers
|
||||||
|
|
||||||
logger = logging.getLogger(str(__name__))
|
logger = logging.getLogger(str(__name__))
|
||||||
|
|
||||||
|
@ -170,8 +170,10 @@ def build_gerrit_triggers(xml_parent, data):
|
||||||
mapping = [
|
mapping = [
|
||||||
('exclude-drafts', 'excludeDrafts', False),
|
('exclude-drafts', 'excludeDrafts', False),
|
||||||
('exclude-trivial-rebase', 'excludeTrivialRebase', False),
|
('exclude-trivial-rebase', 'excludeTrivialRebase', False),
|
||||||
('exclude-no-code-change', 'excludeNoCodeChange', False)]
|
('exclude-no-code-change', 'excludeNoCodeChange', False),
|
||||||
convert_mapping_to_xml(pc, pce, mapping, fail_required=True)
|
]
|
||||||
|
helpers.convert_mapping_to_xml(
|
||||||
|
pc, pce, mapping, fail_required=True)
|
||||||
|
|
||||||
if 'comment-added-event' in event.keys():
|
if 'comment-added-event' in event.keys():
|
||||||
comment_added_event = event['comment-added-event']
|
comment_added_event = event['comment-added-event']
|
||||||
|
@ -181,8 +183,9 @@ def build_gerrit_triggers(xml_parent, data):
|
||||||
mapping = [
|
mapping = [
|
||||||
('approval-category', 'verdictCategory', None),
|
('approval-category', 'verdictCategory', None),
|
||||||
('approval-value',
|
('approval-value',
|
||||||
'commentAddedTriggerApprovalValue', None)]
|
'commentAddedTriggerApprovalValue', None),
|
||||||
convert_mapping_to_xml(cadded,
|
]
|
||||||
|
helpers.convert_mapping_to_xml(cadded,
|
||||||
comment_added_event, mapping, fail_required=True)
|
comment_added_event, mapping, fail_required=True)
|
||||||
|
|
||||||
if 'comment-added-contains-event' in event.keys():
|
if 'comment-added-contains-event' in event.keys():
|
||||||
|
@ -558,7 +561,8 @@ def gerrit(registry, xml_parent, data):
|
||||||
('readable-message', 'readableMessage', False),
|
('readable-message', 'readableMessage', False),
|
||||||
('dependency-jobs', 'dependencyJobsNames', ''),
|
('dependency-jobs', 'dependencyJobsNames', ''),
|
||||||
]
|
]
|
||||||
convert_mapping_to_xml(gtrig, data, general_mappings, fail_required=True)
|
helpers.convert_mapping_to_xml(
|
||||||
|
gtrig, data, general_mappings, fail_required=True)
|
||||||
notification_levels = ['NONE', 'OWNER', 'OWNER_REVIEWERS', 'ALL',
|
notification_levels = ['NONE', 'OWNER', 'OWNER_REVIEWERS', 'ALL',
|
||||||
'SERVER_DEFAULT']
|
'SERVER_DEFAULT']
|
||||||
notification_level = data.get('notification-level', 'SERVER_DEFAULT')
|
notification_level = data.get('notification-level', 'SERVER_DEFAULT')
|
||||||
|
@ -614,7 +618,8 @@ def gerrit(registry, xml_parent, data):
|
||||||
('custom-url', 'customUrl', ''),
|
('custom-url', 'customUrl', ''),
|
||||||
('server-name', 'serverName', '__ANY__'),
|
('server-name', 'serverName', '__ANY__'),
|
||||||
]
|
]
|
||||||
convert_mapping_to_xml(gtrig, data, message_mappings, fail_required=True)
|
helpers.convert_mapping_to_xml(
|
||||||
|
gtrig, data, message_mappings, fail_required=True)
|
||||||
|
|
||||||
|
|
||||||
def dockerhub_notification(registry, xml_parent, data):
|
def dockerhub_notification(registry, xml_parent, data):
|
||||||
|
@ -874,7 +879,7 @@ def jms_messaging(registry, xml_parent, data):
|
||||||
("selector", 'selector', ''),
|
("selector", 'selector', ''),
|
||||||
("provider-name", 'providerName', ''),
|
("provider-name", 'providerName', ''),
|
||||||
]
|
]
|
||||||
convert_mapping_to_xml(jmsm, data, mapping, fail_required=True)
|
helpers.convert_mapping_to_xml(jmsm, data, mapping, fail_required=True)
|
||||||
|
|
||||||
checks = data.get('checks', [])
|
checks = data.get('checks', [])
|
||||||
if len(checks) > 0:
|
if len(checks) > 0:
|
||||||
|
@ -884,8 +889,9 @@ def jms_messaging(registry, xml_parent, data):
|
||||||
'messaging.checks.MsgCheck')
|
'messaging.checks.MsgCheck')
|
||||||
mapping = [
|
mapping = [
|
||||||
('field', 'field', ''),
|
('field', 'field', ''),
|
||||||
('expected-value', 'expectedValue', '')]
|
('expected-value', 'expectedValue', ''),
|
||||||
convert_mapping_to_xml(
|
]
|
||||||
|
helpers.convert_mapping_to_xml(
|
||||||
msgcheck, check, mapping, fail_required=True)
|
msgcheck, check, mapping, fail_required=True)
|
||||||
|
|
||||||
|
|
||||||
|
@ -1239,9 +1245,9 @@ def gitlab_merge_request(registry, xml_parent, data):
|
||||||
('publish-build-progress-messages', '__publishBuildProgressMessages',
|
('publish-build-progress-messages', '__publishBuildProgressMessages',
|
||||||
True),
|
True),
|
||||||
('auto-close-failed', '__autoCloseFailed', False),
|
('auto-close-failed', '__autoCloseFailed', False),
|
||||||
('auto-merge-passed', '__autoMergePassed', False)
|
('auto-merge-passed', '__autoMergePassed', False),
|
||||||
]
|
]
|
||||||
convert_mapping_to_xml(ghprb, data, mapping, True)
|
helpers.convert_mapping_to_xml(ghprb, data, mapping, True)
|
||||||
|
|
||||||
|
|
||||||
def gitlab(registry, xml_parent, data):
|
def gitlab(registry, xml_parent, data):
|
||||||
|
@ -1350,26 +1356,34 @@ def gitlab(registry, xml_parent, data):
|
||||||
if plugin_ver >= pkg_resources.parse_version("1.1.26"):
|
if plugin_ver >= pkg_resources.parse_version("1.1.26"):
|
||||||
mapping = [
|
mapping = [
|
||||||
('trigger-open-merge-request-push',
|
('trigger-open-merge-request-push',
|
||||||
'triggerOpenMergeRequestOnPush', 'never', valid_merge_request)]
|
'triggerOpenMergeRequestOnPush', 'never', valid_merge_request),
|
||||||
convert_mapping_to_xml(gitlab, data, mapping, fail_required=True)
|
]
|
||||||
|
helpers.convert_mapping_to_xml(
|
||||||
|
gitlab, data, mapping, fail_required=True)
|
||||||
else:
|
else:
|
||||||
mapping = [
|
mapping = [
|
||||||
('trigger-open-merge-request-push',
|
('trigger-open-merge-request-push',
|
||||||
'triggerOpenMergeRequestOnPush', True)]
|
'triggerOpenMergeRequestOnPush', True),
|
||||||
convert_mapping_to_xml(gitlab, data, mapping, fail_required=True)
|
]
|
||||||
|
helpers.convert_mapping_to_xml(
|
||||||
|
gitlab, data, mapping, fail_required=True)
|
||||||
|
|
||||||
if plugin_ver < pkg_resources.parse_version('1.2.0'):
|
if plugin_ver < pkg_resources.parse_version('1.2.0'):
|
||||||
if data.get('branch-filter-type', '') == 'All':
|
if data.get('branch-filter-type', '') == 'All':
|
||||||
data['branch-filter-type'] = ''
|
data['branch-filter-type'] = ''
|
||||||
valid_filters = ['', 'NameBasedFilter', 'RegexBasedFilter']
|
valid_filters = ['', 'NameBasedFilter', 'RegexBasedFilter']
|
||||||
mapping = [
|
mapping = [
|
||||||
('branch-filter-type', 'branchFilterName', '', valid_filters)]
|
('branch-filter-type', 'branchFilterName', '', valid_filters),
|
||||||
convert_mapping_to_xml(gitlab, data, mapping, fail_required=True)
|
]
|
||||||
|
helpers.convert_mapping_to_xml(
|
||||||
|
gitlab, data, mapping, fail_required=True)
|
||||||
else:
|
else:
|
||||||
valid_filters = ['All', 'NameBasedFilter', 'RegexBasedFilter']
|
valid_filters = ['All', 'NameBasedFilter', 'RegexBasedFilter']
|
||||||
mapping = [
|
mapping = [
|
||||||
('branch-filter-type', 'branchFilterType', 'All', valid_filters)]
|
('branch-filter-type', 'branchFilterType', 'All', valid_filters),
|
||||||
convert_mapping_to_xml(gitlab, data, mapping, fail_required=True)
|
]
|
||||||
|
helpers.convert_mapping_to_xml(
|
||||||
|
gitlab, data, mapping, fail_required=True)
|
||||||
|
|
||||||
XML.SubElement(gitlab, 'spec').text = ''
|
XML.SubElement(gitlab, 'spec').text = ''
|
||||||
mapping = [
|
mapping = [
|
||||||
|
@ -1396,7 +1410,7 @@ def gitlab(registry, xml_parent, data):
|
||||||
('include-branches', 'includeBranchesSpec', []),
|
('include-branches', 'includeBranchesSpec', []),
|
||||||
('exclude-branches', 'excludeBranchesSpec', []),
|
('exclude-branches', 'excludeBranchesSpec', []),
|
||||||
)
|
)
|
||||||
convert_mapping_to_xml(gitlab, data, mapping, fail_required=True)
|
helpers.convert_mapping_to_xml(gitlab, data, mapping, fail_required=True)
|
||||||
|
|
||||||
for yaml_name, xml_name, default_val in list_mapping:
|
for yaml_name, xml_name, default_val in list_mapping:
|
||||||
value = ', '.join(data.get(yaml_name, default_val))
|
value = ', '.join(data.get(yaml_name, default_val))
|
||||||
|
@ -1437,7 +1451,7 @@ def build_result(registry, xml_parent, data):
|
||||||
('cron', 'spec', ''),
|
('cron', 'spec', ''),
|
||||||
('combine', 'combinedJobs', False),
|
('combine', 'combinedJobs', False),
|
||||||
]
|
]
|
||||||
convert_mapping_to_xml(brt, data, mapping, fail_required=True)
|
helpers.convert_mapping_to_xml(brt, data, mapping, fail_required=True)
|
||||||
jobs_info = XML.SubElement(brt, 'jobsInfo')
|
jobs_info = XML.SubElement(brt, 'jobsInfo')
|
||||||
result_dict = {'success': 'SUCCESS',
|
result_dict = {'success': 'SUCCESS',
|
||||||
'unstable': 'UNSTABLE',
|
'unstable': 'UNSTABLE',
|
||||||
|
@ -1449,15 +1463,20 @@ def build_result(registry, xml_parent, data):
|
||||||
'buildresulttrigger.model.'
|
'buildresulttrigger.model.'
|
||||||
'BuildResultTriggerInfo')
|
'BuildResultTriggerInfo')
|
||||||
jobs_string = ",".join(group['jobs'])
|
jobs_string = ",".join(group['jobs'])
|
||||||
mapping = [('', 'jobNames', jobs_string, group)]
|
mapping = [
|
||||||
convert_mapping_to_xml(brti, group, mapping, fail_required=True)
|
('', 'jobNames', jobs_string, group),
|
||||||
|
]
|
||||||
|
helpers.convert_mapping_to_xml(
|
||||||
|
brti, group, mapping, fail_required=True)
|
||||||
checked_results = XML.SubElement(brti, 'checkedResults')
|
checked_results = XML.SubElement(brti, 'checkedResults')
|
||||||
for result in group.get('results', ['success']):
|
for result in group.get('results', ['success']):
|
||||||
model_checked = XML.SubElement(checked_results, 'org.jenkinsci.'
|
model_checked = XML.SubElement(checked_results, 'org.jenkinsci.'
|
||||||
'plugins.buildresulttrigger.model.'
|
'plugins.buildresulttrigger.model.'
|
||||||
'CheckedResult')
|
'CheckedResult')
|
||||||
mapping = [('', 'checked', result, result_dict)]
|
mapping = [
|
||||||
convert_mapping_to_xml(
|
('', 'checked', result, result_dict),
|
||||||
|
]
|
||||||
|
helpers.convert_mapping_to_xml(
|
||||||
model_checked, result_dict, mapping, fail_required=True)
|
model_checked, result_dict, mapping, fail_required=True)
|
||||||
|
|
||||||
|
|
||||||
|
@ -1555,7 +1574,7 @@ def monitor_folders(registry, xml_parent, data):
|
||||||
('path', 'path', ''),
|
('path', 'path', ''),
|
||||||
('cron', 'spec', ''),
|
('cron', 'spec', ''),
|
||||||
]
|
]
|
||||||
convert_mapping_to_xml(ft, data, mappings, fail_required=True)
|
helpers.convert_mapping_to_xml(ft, data, mappings, fail_required=True)
|
||||||
|
|
||||||
includes = data.get('includes', '')
|
includes = data.get('includes', '')
|
||||||
XML.SubElement(ft, 'includes').text = ",".join(includes)
|
XML.SubElement(ft, 'includes').text = ",".join(includes)
|
||||||
|
@ -1674,7 +1693,7 @@ def monitor_files(registry, xml_parent, data):
|
||||||
('strategy', 'strategy', 'LATEST', valid_strategies),
|
('strategy', 'strategy', 'LATEST', valid_strategies),
|
||||||
('', 'inspectingContentFile', bool(check_content)),
|
('', 'inspectingContentFile', bool(check_content)),
|
||||||
]
|
]
|
||||||
convert_mapping_to_xml(
|
helpers.convert_mapping_to_xml(
|
||||||
file_tag, file_info, files_mapping, fail_required=True)
|
file_tag, file_info, files_mapping, fail_required=True)
|
||||||
|
|
||||||
base_content_tag = XML.SubElement(file_tag, 'contentFileTypes')
|
base_content_tag = XML.SubElement(file_tag, 'contentFileTypes')
|
||||||
|
@ -1748,7 +1767,7 @@ def ivy(registry, xml_parent, data):
|
||||||
('enable-concurrent', 'enableConcurrentBuild', False),
|
('enable-concurrent', 'enableConcurrentBuild', False),
|
||||||
('cron', 'spec', ''),
|
('cron', 'spec', ''),
|
||||||
]
|
]
|
||||||
convert_mapping_to_xml(it, data, mapping, fail_required=False)
|
helpers.convert_mapping_to_xml(it, data, mapping, fail_required=False)
|
||||||
|
|
||||||
properties_file_path = data.get('properties-file', [])
|
properties_file_path = data.get('properties-file', [])
|
||||||
XML.SubElement(it, 'propertiesFilePath').text = ";".join(
|
XML.SubElement(it, 'propertiesFilePath').text = ";".join(
|
||||||
|
@ -1800,7 +1819,7 @@ def script(registry, xml_parent, data):
|
||||||
('', 'labelRestriction', bool(label)),
|
('', 'labelRestriction', bool(label)),
|
||||||
('', 'triggerLabel', label),
|
('', 'triggerLabel', label),
|
||||||
]
|
]
|
||||||
convert_mapping_to_xml(st, data, mappings, fail_required=False)
|
helpers.convert_mapping_to_xml(st, data, mappings, fail_required=False)
|
||||||
|
|
||||||
|
|
||||||
def groovy_script(registry, xml_parent, data):
|
def groovy_script(registry, xml_parent, data):
|
||||||
|
@ -1850,7 +1869,7 @@ def groovy_script(registry, xml_parent, data):
|
||||||
('', 'labelRestriction', bool(label)),
|
('', 'labelRestriction', bool(label)),
|
||||||
('', 'triggerLabel', label),
|
('', 'triggerLabel', label),
|
||||||
]
|
]
|
||||||
convert_mapping_to_xml(gst, data, mappings, fail_required=False)
|
helpers.convert_mapping_to_xml(gst, data, mappings, fail_required=False)
|
||||||
|
|
||||||
|
|
||||||
def rabbitmq(registry, xml_parent, data):
|
def rabbitmq(registry, xml_parent, data):
|
||||||
|
@ -1873,8 +1892,9 @@ def rabbitmq(registry, xml_parent, data):
|
||||||
'RemoteBuildTrigger')
|
'RemoteBuildTrigger')
|
||||||
mapping = [
|
mapping = [
|
||||||
('', 'spec', ''),
|
('', 'spec', ''),
|
||||||
('token', 'remoteBuildToken', None)]
|
('token', 'remoteBuildToken', None),
|
||||||
convert_mapping_to_xml(rabbitmq, data, mapping, fail_required=True)
|
]
|
||||||
|
helpers.convert_mapping_to_xml(rabbitmq, data, mapping, fail_required=True)
|
||||||
|
|
||||||
|
|
||||||
def parameterized_timer(parser, xml_parent, data):
|
def parameterized_timer(parser, xml_parent, data):
|
||||||
|
@ -1899,8 +1919,10 @@ def parameterized_timer(parser, xml_parent, data):
|
||||||
'ParameterizedTimerTrigger')
|
'ParameterizedTimerTrigger')
|
||||||
mapping = [
|
mapping = [
|
||||||
('', 'spec', ''),
|
('', 'spec', ''),
|
||||||
('cron', 'parameterizedSpecification', None)]
|
('cron', 'parameterizedSpecification', None),
|
||||||
convert_mapping_to_xml(param_timer, data, mapping, fail_required=True)
|
]
|
||||||
|
helpers.convert_mapping_to_xml(
|
||||||
|
param_timer, data, mapping, fail_required=True)
|
||||||
|
|
||||||
|
|
||||||
def jira_changelog(registry, xml_parent, data):
|
def jira_changelog(registry, xml_parent, data):
|
||||||
|
@ -1961,8 +1983,10 @@ def jira_changelog(registry, xml_parent, data):
|
||||||
'jiratrigger.JiraChangelogTrigger')
|
'jiratrigger.JiraChangelogTrigger')
|
||||||
jcht.set('plugin', 'jira-trigger')
|
jcht.set('plugin', 'jira-trigger')
|
||||||
|
|
||||||
mapping = [('jql-filter', 'jqlFilter', '')]
|
mapping = [
|
||||||
convert_mapping_to_xml(jcht, data, mapping, fail_required=True)
|
('jql-filter', 'jqlFilter', ''),
|
||||||
|
]
|
||||||
|
helpers.convert_mapping_to_xml(jcht, data, mapping, fail_required=True)
|
||||||
|
|
||||||
changelog = XML.SubElement(jcht, 'changelogMatchers')
|
changelog = XML.SubElement(jcht, 'changelogMatchers')
|
||||||
mappings = [
|
mappings = [
|
||||||
|
@ -1987,7 +2011,7 @@ def jira_changelog(registry, xml_parent, data):
|
||||||
'JiraFieldChangelogMatcher')
|
'JiraFieldChangelogMatcher')
|
||||||
XML.SubElement(parent_tag, 'fieldType').text = 'JIRA'
|
XML.SubElement(parent_tag, 'fieldType').text = 'JIRA'
|
||||||
|
|
||||||
convert_mapping_to_xml(parent_tag, matcher,
|
helpers.convert_mapping_to_xml(parent_tag, matcher,
|
||||||
mappings, fail_required=True)
|
mappings, fail_required=True)
|
||||||
|
|
||||||
param = XML.SubElement(jcht, 'parameterMappings')
|
param = XML.SubElement(jcht, 'parameterMappings')
|
||||||
|
@ -1999,7 +2023,7 @@ def jira_changelog(registry, xml_parent, data):
|
||||||
parent = XML.SubElement(param, 'com.ceilfors.jenkins.plugins.'
|
parent = XML.SubElement(param, 'com.ceilfors.jenkins.plugins.'
|
||||||
'jiratrigger.parameter.'
|
'jiratrigger.parameter.'
|
||||||
'IssueAttributePathParameterMapping')
|
'IssueAttributePathParameterMapping')
|
||||||
convert_mapping_to_xml(
|
helpers.convert_mapping_to_xml(
|
||||||
parent, parameter, parameter_mappings, fail_required=True)
|
parent, parameter, parameter_mappings, fail_required=True)
|
||||||
|
|
||||||
|
|
||||||
|
@ -2037,8 +2061,9 @@ def jira_comment_trigger(registry, xml_parent, data):
|
||||||
jct.set('plugin', 'jira-trigger')
|
jct.set('plugin', 'jira-trigger')
|
||||||
mapping = [
|
mapping = [
|
||||||
('jql-filter', 'jqlFilter', ''),
|
('jql-filter', 'jqlFilter', ''),
|
||||||
('comment-pattern', 'commentPattern', '(?i)build this please')]
|
('comment-pattern', 'commentPattern', '(?i)build this please'),
|
||||||
convert_mapping_to_xml(jct, data, mapping, fail_required=True)
|
]
|
||||||
|
helpers.convert_mapping_to_xml(jct, data, mapping, fail_required=True)
|
||||||
|
|
||||||
param = XML.SubElement(jct, 'parameterMappings')
|
param = XML.SubElement(jct, 'parameterMappings')
|
||||||
for parameter in data.get('parameter-mapping', []):
|
for parameter in data.get('parameter-mapping', []):
|
||||||
|
@ -2047,8 +2072,9 @@ def jira_comment_trigger(registry, xml_parent, data):
|
||||||
'IssueAttributePathParameterMapping')
|
'IssueAttributePathParameterMapping')
|
||||||
parameter_mappings = [
|
parameter_mappings = [
|
||||||
('jenkins-parameter', 'jenkinsParameter', ''),
|
('jenkins-parameter', 'jenkinsParameter', ''),
|
||||||
('issue-attribute-path', 'issueAttributePath', '')]
|
('issue-attribute-path', 'issueAttributePath', ''),
|
||||||
convert_mapping_to_xml(
|
]
|
||||||
|
helpers.convert_mapping_to_xml(
|
||||||
parent, parameter, parameter_mappings, fail_required=True)
|
parent, parameter, parameter_mappings, fail_required=True)
|
||||||
|
|
||||||
|
|
||||||
|
@ -2120,7 +2146,8 @@ def stash_pull_request(registry, xml_parent, data):
|
||||||
'deletePreviousBuildFinishComments', False),
|
'deletePreviousBuildFinishComments', False),
|
||||||
('cancel-outdated-jobs', 'cancelOutdatedJobsEnabled', False),
|
('cancel-outdated-jobs', 'cancelOutdatedJobsEnabled', False),
|
||||||
]
|
]
|
||||||
convert_mapping_to_xml(pr_trigger, data, mappings, fail_required=True)
|
helpers.convert_mapping_to_xml(
|
||||||
|
pr_trigger, data, mappings, fail_required=True)
|
||||||
|
|
||||||
|
|
||||||
class Triggers(jenkins_jobs.modules.base.Base):
|
class Triggers(jenkins_jobs.modules.base.Base):
|
||||||
|
|
Loading…
Reference in New Issue