From 70e6adb4eb88a294d3cd6efc5a102dfb62db5137 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Wed, 28 Jun 2017 18:59:29 -0400 Subject: Default gitlab to newest plugin config format Change-Id: I51ca15b9bfef42b79e03c4a2ba0bb9f23d880188 Signed-off-by: Thanh Ha --- jenkins_jobs/modules/triggers.py | 7 ++++++- tests/triggers/fixtures/gitlab001.plugins_info.yaml | 3 +++ tests/triggers/fixtures/gitlab002.plugins_info.yaml | 3 +++ tests/triggers/fixtures/gitlab003.plugins_info.yaml | 3 +++ 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 tests/triggers/fixtures/gitlab001.plugins_info.yaml create mode 100644 tests/triggers/fixtures/gitlab002.plugins_info.yaml create mode 100644 tests/triggers/fixtures/gitlab003.plugins_info.yaml diff --git a/jenkins_jobs/modules/triggers.py b/jenkins_jobs/modules/triggers.py index 99db03b1..bf45ea5a 100644 --- a/jenkins_jobs/modules/triggers.py +++ b/jenkins_jobs/modules/triggers.py @@ -32,6 +32,7 @@ Example:: import logging import pkg_resources import re +import sys import xml.etree.ElementTree as XML import six @@ -1238,8 +1239,12 @@ def gitlab(registry, xml_parent, data): gitlab = XML.SubElement( xml_parent, 'com.dabsquared.gitlabjenkins.GitLabPushTrigger' ) + plugin_info = registry.get_plugin_info('GitLab Plugin') - plugin_ver = pkg_resources.parse_version(plugin_info.get('version', "0")) + # Note: Assume latest version of plugin is preferred config format + plugin_ver = pkg_resources.parse_version( + plugin_info.get('version', str(sys.maxsize))) + valid_merge_request = ['never', 'source', 'both'] if plugin_ver >= pkg_resources.parse_version("1.1.26"): diff --git a/tests/triggers/fixtures/gitlab001.plugins_info.yaml b/tests/triggers/fixtures/gitlab001.plugins_info.yaml new file mode 100644 index 00000000..235eb291 --- /dev/null +++ b/tests/triggers/fixtures/gitlab001.plugins_info.yaml @@ -0,0 +1,3 @@ +- longName: 'GitLab Plugin' + shortName: 'gitlab-plugin' + version: "0" diff --git a/tests/triggers/fixtures/gitlab002.plugins_info.yaml b/tests/triggers/fixtures/gitlab002.plugins_info.yaml new file mode 100644 index 00000000..235eb291 --- /dev/null +++ b/tests/triggers/fixtures/gitlab002.plugins_info.yaml @@ -0,0 +1,3 @@ +- longName: 'GitLab Plugin' + shortName: 'gitlab-plugin' + version: "0" diff --git a/tests/triggers/fixtures/gitlab003.plugins_info.yaml b/tests/triggers/fixtures/gitlab003.plugins_info.yaml new file mode 100644 index 00000000..235eb291 --- /dev/null +++ b/tests/triggers/fixtures/gitlab003.plugins_info.yaml @@ -0,0 +1,3 @@ +- longName: 'GitLab Plugin' + shortName: 'gitlab-plugin' + version: "0" -- cgit