From 38fc311dcdda6fdf8272bb06dc3961ca037dc8e6 Mon Sep 17 00:00:00 2001
From: Bulat Gaifullin <gaifullinbf@gmail.com>
Date: Tue, 21 Feb 2017 20:26:04 +0300
Subject: [PATCH] Fixed serialization for 'branch-filter-type' of gitlab

tag 'branchFilterType' was introduced only in GitLab+Plugin ver. 1.2.0

Change-Id: I8cee5b4b77431fa78d28fe359a4fafc5609bde3e
Story: 2000875
---
 jenkins_jobs/modules/triggers.py      | 2 +-
 tests/triggers/fixtures/gitlab001.xml | 2 +-
 tests/triggers/fixtures/gitlab002.xml | 2 +-
 tests/triggers/fixtures/gitlab003.xml | 2 +-
 tests/triggers/fixtures/gitlab004.xml | 2 +-
 tests/triggers/fixtures/gitlab005.xml | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jenkins_jobs/modules/triggers.py b/jenkins_jobs/modules/triggers.py
index 18855666d..c1734c31c 100644
--- a/jenkins_jobs/modules/triggers.py
+++ b/jenkins_jobs/modules/triggers.py
@@ -1176,7 +1176,7 @@ def gitlab(registry, xml_parent, data):
              'triggerOpenMergeRequestOnPush', True)]
         convert_mapping_to_xml(gitlab, data, mapping, fail_required=True)
 
-    if plugin_ver == pkg_resources.parse_version('1.1.29'):
+    if plugin_ver < pkg_resources.parse_version('1.2.0'):
         if data.get('branch-filter-type', '') == 'All':
             data['branch-filter-type'] = ''
         valid_filters = ['', 'NameBasedFilter', 'RegexBasedFilter']
diff --git a/tests/triggers/fixtures/gitlab001.xml b/tests/triggers/fixtures/gitlab001.xml
index 2b199809f..1c03682d4 100644
--- a/tests/triggers/fixtures/gitlab001.xml
+++ b/tests/triggers/fixtures/gitlab001.xml
@@ -3,7 +3,7 @@
   <triggers class="vector">
     <com.dabsquared.gitlabjenkins.GitLabPushTrigger>
       <triggerOpenMergeRequestOnPush>true</triggerOpenMergeRequestOnPush>
-      <branchFilterType>All</branchFilterType>
+      <branchFilterName/>
       <spec/>
       <triggerOnPush>true</triggerOnPush>
       <triggerOnMergeRequest>true</triggerOnMergeRequest>
diff --git a/tests/triggers/fixtures/gitlab002.xml b/tests/triggers/fixtures/gitlab002.xml
index e82157ec9..48a583d9b 100644
--- a/tests/triggers/fixtures/gitlab002.xml
+++ b/tests/triggers/fixtures/gitlab002.xml
@@ -3,7 +3,7 @@
   <triggers class="vector">
     <com.dabsquared.gitlabjenkins.GitLabPushTrigger>
       <triggerOpenMergeRequestOnPush>true</triggerOpenMergeRequestOnPush>
-      <branchFilterType>All</branchFilterType>
+      <branchFilterName/>
       <spec/>
       <triggerOnPush>true</triggerOnPush>
       <triggerOnMergeRequest>true</triggerOnMergeRequest>
diff --git a/tests/triggers/fixtures/gitlab003.xml b/tests/triggers/fixtures/gitlab003.xml
index 7e85278a1..baf204d09 100644
--- a/tests/triggers/fixtures/gitlab003.xml
+++ b/tests/triggers/fixtures/gitlab003.xml
@@ -3,7 +3,7 @@
   <triggers class="vector">
     <com.dabsquared.gitlabjenkins.GitLabPushTrigger>
       <triggerOpenMergeRequestOnPush>true</triggerOpenMergeRequestOnPush>
-      <branchFilterType>All</branchFilterType>
+      <branchFilterName/>
       <spec/>
       <triggerOnPush>true</triggerOnPush>
       <triggerOnMergeRequest>true</triggerOnMergeRequest>
diff --git a/tests/triggers/fixtures/gitlab004.xml b/tests/triggers/fixtures/gitlab004.xml
index 94d8f4fd1..d10d661aa 100644
--- a/tests/triggers/fixtures/gitlab004.xml
+++ b/tests/triggers/fixtures/gitlab004.xml
@@ -3,7 +3,7 @@
   <triggers class="vector">
     <com.dabsquared.gitlabjenkins.GitLabPushTrigger>
       <triggerOpenMergeRequestOnPush>both</triggerOpenMergeRequestOnPush>
-      <branchFilterType>All</branchFilterType>
+      <branchFilterName/>
       <spec/>
       <triggerOnPush>false</triggerOnPush>
       <triggerOnMergeRequest>false</triggerOnMergeRequest>
diff --git a/tests/triggers/fixtures/gitlab005.xml b/tests/triggers/fixtures/gitlab005.xml
index 7870ff705..3e1e168ce 100644
--- a/tests/triggers/fixtures/gitlab005.xml
+++ b/tests/triggers/fixtures/gitlab005.xml
@@ -3,7 +3,7 @@
   <triggers class="vector">
     <com.dabsquared.gitlabjenkins.GitLabPushTrigger>
       <triggerOpenMergeRequestOnPush>never</triggerOpenMergeRequestOnPush>
-      <branchFilterType>All</branchFilterType>
+      <branchFilterName/>
       <spec/>
       <triggerOnPush>true</triggerOnPush>
       <triggerOnMergeRequest>true</triggerOnMergeRequest>