jjb
/
jenkins-job-builder
Code Issues Proposed changes

Merge "Default artifactory-generic to newest plugin config format"

This commit is contained in:
Jenkins 2017-09-20 00:43:09 +00:00 committed by Gerrit Code Review
parent 9e342cc5bd 47ab1173e0
commit 7b1a71d882
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jenkins_jobs/modules/wrappers.py
View File

@ -24,6 +24,7 @@ Wrappers can alter the way the build is run as well as the build output.
import logging
import pkg_resources
import sys
import xml.etree.ElementTree as XML
from jenkins_jobs.errors import InvalidAttributeError
@ -2114,7 +2115,9 @@ def artifactory_generic(registry, xml_parent, data):
# Get plugin information to maintain backwards compatibility
info = registry.get_plugin_info('artifactory')
version = pkg_resources.parse_version(info.get('version', '0'))
# Note: Assume latest version of plugin is preferred config format
version = pkg_resources.parse_version(
info.get('version', str(sys.maxsize)))
if version >= pkg_resources.parse_version('2.3.0'):
deployReleaseRepo = XML.SubElement(details, 'deployReleaseRepository')

3
tests/wrappers/fixtures/artifactory002.plugins_info.yaml Normal file
View File

@ -0,0 +1,3 @@
- longName: 'Jenkins Artifactory Plugin'
shortName: 'artifactory'
version: "0"