diff options
| author | Zuul <zuul@review.openstack.org> | 2018-09-21 13:49:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-09-21 13:49:39 +0000 |
| commit | ca688f6c2ac279e53a5f8c9b63bbbc6de535b414 (patch) | |
| tree | ae9ee7db27107d67aa52d9cace1b70785d397ad5 /tests | |
| parent | 192286d700a916131770488ca5d8df0f9012f5e3 (diff) | |
| parent | 56c8d33b143c8f01808001ea0698614497e818d1 (diff) | |
| download | python-jenkins-job-builder-ca688f6c2ac279e53a5f8c9b63bbbc6de535b414.tar.gz python-jenkins-job-builder-ca688f6c2ac279e53a5f8c9b63bbbc6de535b414.tar.xz python-jenkins-job-builder-ca688f6c2ac279e53a5f8c9b63bbbc6de535b414.zip | |
Merge "gitlab-merge-request: Add support for 2.x"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/triggers/fixtures/gitlab-merge-request001.plugins_info.yaml | 3 | ||||
| -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.yaml | 3 | ||||
| -rw-r--r-- | tests/triggers/fixtures/gitlab-merge-request002.xml | 16 | ||||
| -rw-r--r-- | tests/triggers/fixtures/gitlab-merge-request002.yaml | 11 |
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 |