Merge "artifactory-generic: Utilize convert_mapping_to_xml"
This commit is contained in:
commit
c32bb73d70
|
@ -2341,18 +2341,22 @@ def artifactory_generic(registry, xml_parent, data):
|
||||||
info.get('version', str(sys.maxsize)))
|
info.get('version', str(sys.maxsize)))
|
||||||
|
|
||||||
if version >= pkg_resources.parse_version('2.3.0'):
|
if version >= pkg_resources.parse_version('2.3.0'):
|
||||||
deployReleaseRepo = XML.SubElement(details, 'deployReleaseRepository')
|
deploy_release_repo = XML.SubElement(
|
||||||
XML.SubElement(deployReleaseRepo, 'keyFromText').text = data.get(
|
details, 'deployReleaseRepository')
|
||||||
'key-from-text', '')
|
mapping = [
|
||||||
XML.SubElement(deployReleaseRepo, 'keyFromSelect').text = data.get(
|
('key-from-text', 'keyFromText', ''),
|
||||||
'key-from-select', '')
|
('key-from-select', 'keyFromSelect', ''),
|
||||||
XML.SubElement(deployReleaseRepo, 'dynamicMode').text = str(
|
('key-from-text', 'dynamicMode', ''),
|
||||||
'key-from-text' in data.keys()).lower()
|
]
|
||||||
|
helpers.convert_mapping_to_xml(
|
||||||
|
deploy_release_repo, data, mapping, fail_required=False)
|
||||||
else:
|
else:
|
||||||
XML.SubElement(details, 'repositoryKey').text = data.get(
|
mapping = [
|
||||||
'repo-key', '')
|
('repo-key', 'repositoryKey', ''),
|
||||||
XML.SubElement(details, 'snapshotsRepositoryKey').text = data.get(
|
('snapshot-repo-key', 'snapshotsRepositoryKey', ''),
|
||||||
'snapshot-repo-key', '')
|
]
|
||||||
|
helpers.convert_mapping_to_xml(
|
||||||
|
details, data, mapping, fail_required=False)
|
||||||
|
|
||||||
XML.SubElement(artifactory, 'deployPattern').text = ','.join(data.get(
|
XML.SubElement(artifactory, 'deployPattern').text = ','.join(data.get(
|
||||||
'deploy-pattern', []))
|
'deploy-pattern', []))
|
||||||
|
@ -2360,15 +2364,14 @@ def artifactory_generic(registry, xml_parent, data):
|
||||||
data.get('resolve-pattern', []))
|
data.get('resolve-pattern', []))
|
||||||
XML.SubElement(artifactory, 'matrixParams').text = ','.join(
|
XML.SubElement(artifactory, 'matrixParams').text = ','.join(
|
||||||
data.get('matrix-params', []))
|
data.get('matrix-params', []))
|
||||||
|
mapping = [
|
||||||
XML.SubElement(artifactory, 'deployBuildInfo').text = str(
|
('deploy-build-info', 'deployBuildInfo', False),
|
||||||
data.get('deploy-build-info', False)).lower()
|
('env-vars-include', 'includeEnvVars', False),
|
||||||
XML.SubElement(artifactory, 'includeEnvVars').text = str(
|
('discard-old-builds', 'discardOldBuilds', False),
|
||||||
data.get('env-vars-include', False)).lower()
|
('discard-build-artifacts', 'discardBuildArtifacts', True),
|
||||||
XML.SubElement(artifactory, 'discardOldBuilds').text = str(
|
]
|
||||||
data.get('discard-old-builds', False)).lower()
|
helpers.convert_mapping_to_xml(
|
||||||
XML.SubElement(artifactory, 'discardBuildArtifacts').text = str(
|
artifactory, data, mapping, fail_required=False)
|
||||||
data.get('discard-build-artifacts', True)).lower()
|
|
||||||
|
|
||||||
# envVarsPatterns
|
# envVarsPatterns
|
||||||
helpers.artifactory_env_vars_patterns(artifactory, data)
|
helpers.artifactory_env_vars_patterns(artifactory, data)
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<deployReleaseRepository>
|
<deployReleaseRepository>
|
||||||
<keyFromText/>
|
<keyFromText/>
|
||||||
<keyFromSelect>repo</keyFromSelect>
|
<keyFromSelect>repo</keyFromSelect>
|
||||||
<dynamicMode>false</dynamicMode>
|
<dynamicMode/>
|
||||||
</deployReleaseRepository>
|
</deployReleaseRepository>
|
||||||
</details>
|
</details>
|
||||||
<deployPattern>*.zip=>results</deployPattern>
|
<deployPattern>*.zip=>results</deployPattern>
|
||||||
|
|
Loading…
Reference in New Issue