summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJaime Melis <jmelis@redhat.com>2018-08-31 10:25:10 +0200
committerJaime Melis <jmelis@redhat.com>2018-09-21 10:50:08 +0200
commit56c8d33b143c8f01808001ea0698614497e818d1 (patch)
treed58108ca5005882aa09e2efd01ab06f27e799ea0 /tests
parent4d5397c496abc1097d7214dafee5f16d7f49e066 (diff)
downloadpython-jenkins-job-builder-56c8d33b143c8f01808001ea0698614497e818d1.tar.gz
python-jenkins-job-builder-56c8d33b143c8f01808001ea0698614497e818d1.tar.xz
python-jenkins-job-builder-56c8d33b143c8f01808001ea0698614497e818d1.zip
gitlab-merge-request: Add support for 2.x
This patch adds support for gitlab-merge-request 2.x. As indicated by the plugin homepage [1]: * GitLab version < 8.1: use v1.2.4 of this plugin * GitLab version >= 8.1 < 11: use v2.0.1 of this plugin * GitLab version >= 11: use the latest version of this plugin GitLab 8.1 was released on Oct 22, 2015. [1]: https://github.com/timols/jenkins-gitlab-merge-request-builder-plugin#supported-gitlab-versions Change-Id: I0c7618715ba3fad162bfe20819a7721e1c83ad13
Diffstat (limited to 'tests')
-rw-r--r--tests/triggers/fixtures/gitlab-merge-request001.plugins_info.yaml3
-rw-r--r--tests/triggers/fixtures/gitlab-merge-request001.xml (renamed from tests/triggers/fixtures/gitlab-merge-request.xml)0
-rw-r--r--tests/triggers/fixtures/gitlab-merge-request001.yaml (renamed from tests/triggers/fixtures/gitlab-merge-request.yaml)0
-rw-r--r--tests/triggers/fixtures/gitlab-merge-request002.plugins_info.yaml3
-rw-r--r--tests/triggers/fixtures/gitlab-merge-request002.xml16
-rw-r--r--tests/triggers/fixtures/gitlab-merge-request002.yaml11
6 files changed, 33 insertions, 0 deletions
diff --git a/tests/triggers/fixtures/gitlab-merge-request001.plugins_info.yaml b/tests/triggers/fixtures/gitlab-merge-request001.plugins_info.yaml
new file mode 100644
index 00000000..7e8ffa42
--- /dev/null
+++ b/tests/triggers/fixtures/gitlab-merge-request001.plugins_info.yaml
@@ -0,0 +1,3 @@
+- longName: 'Gitlab Merge Request Builder'
+ shortName: 'gitlab-merge-request-jenkins'
+ version: '0'
diff --git a/tests/triggers/fixtures/gitlab-merge-request.xml b/tests/triggers/fixtures/gitlab-merge-request001.xml
index 0bba820b..0bba820b 100644
--- a/tests/triggers/fixtures/gitlab-merge-request.xml
+++ b/tests/triggers/fixtures/gitlab-merge-request001.xml
diff --git a/tests/triggers/fixtures/gitlab-merge-request.yaml b/tests/triggers/fixtures/gitlab-merge-request001.yaml
index 82bc234b..82bc234b 100644
--- a/tests/triggers/fixtures/gitlab-merge-request.yaml
+++ b/tests/triggers/fixtures/gitlab-merge-request001.yaml
diff --git a/tests/triggers/fixtures/gitlab-merge-request002.plugins_info.yaml b/tests/triggers/fixtures/gitlab-merge-request002.plugins_info.yaml
new file mode 100644
index 00000000..723f3c7a
--- /dev/null
+++ b/tests/triggers/fixtures/gitlab-merge-request002.plugins_info.yaml
@@ -0,0 +1,3 @@
+- longName: 'Gitlab Merge Request Builder'
+ shortName: 'gitlab-merge-request-jenkins'
+ version: '2'
diff --git a/tests/triggers/fixtures/gitlab-merge-request002.xml b/tests/triggers/fixtures/gitlab-merge-request002.xml
new file mode 100644
index 00000000..63f0c65a
--- /dev/null
+++ b/tests/triggers/fixtures/gitlab-merge-request002.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+ <triggers class="vector">
+ <org.jenkinsci.plugins.gitlab.GitlabBuildTrigger>
+ <spec>* * * * *</spec>
+ <projectPath>test/project</projectPath>
+ <targetBranchRegex>(.*release.*|.*hotfix.*)</targetBranchRegex>
+ <useHttpUrl>false</useHttpUrl>
+ <assigneeFilter>jenkinsbot</assigneeFilter>
+ <tagFilter>fix</tagFilter>
+ <triggerComment>rebuild</triggerComment>
+ <autoCloseFailed>false</autoCloseFailed>
+ <autoMergePassed>false</autoMergePassed>
+ </org.jenkinsci.plugins.gitlab.GitlabBuildTrigger>
+ </triggers>
+</project>
diff --git a/tests/triggers/fixtures/gitlab-merge-request002.yaml b/tests/triggers/fixtures/gitlab-merge-request002.yaml
new file mode 100644
index 00000000..f8a9a6a3
--- /dev/null
+++ b/tests/triggers/fixtures/gitlab-merge-request002.yaml
@@ -0,0 +1,11 @@
+triggers:
+ - gitlab-merge-request:
+ cron: '* * * * *'
+ project-path: 'test/project'
+ target-branch-regex: '(.*release.*|.*hotfix.*)'
+ use-http-url: false
+ assignee-filter: 'jenkinsbot'
+ tag-filter: 'fix'
+ trigger-comment: 'rebuild'
+ auto-close-failed: false
+ auto-merge-passed: false