summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-17 17:03:46 +0000
committerGerrit Code Review <review@openstack.org>2018-07-17 17:03:46 +0000
commit2801467eb9a9cd11b46ed64f1e262357706eeb7e (patch)
treed7e4c0dd7176f52564f63cff57ea4857804e9c9c /tests
parent7acc67fffe47f813283b6295c3a31c13c5fb7d53 (diff)
parent70f7ef229104e5f61afb48af9395cbdf94b57a9e (diff)
downloadpython-jenkins-job-builder-2801467eb9a9cd11b46ed64f1e262357706eeb7e.tar.gz
python-jenkins-job-builder-2801467eb9a9cd11b46ed64f1e262357706eeb7e.tar.xz
python-jenkins-job-builder-2801467eb9a9cd11b46ed64f1e262357706eeb7e.zip
Merge "ghprb: blacklist-target-branches support"
Diffstat (limited to 'tests')
-rw-r--r--tests/triggers/fixtures/github-pull-request-full.xml8
-rw-r--r--tests/triggers/fixtures/github-pull-request-full.yaml3
2 files changed, 11 insertions, 0 deletions
diff --git a/tests/triggers/fixtures/github-pull-request-full.xml b/tests/triggers/fixtures/github-pull-request-full.xml
index 8448a539..3f282fda 100644
--- a/tests/triggers/fixtures/github-pull-request-full.xml
+++ b/tests/triggers/fixtures/github-pull-request-full.xml
@@ -34,6 +34,14 @@ region</includedRegions>
<branch>testing</branch>
</org.jenkinsci.plugins.ghprb.GhprbBranch>
</whiteListTargetBranches>
+ <blackListTargetBranches>
+ <org.jenkinsci.plugins.ghprb.GhprbBranch>
+ <branch>master</branch>
+ </org.jenkinsci.plugins.ghprb.GhprbBranch>
+ <org.jenkinsci.plugins.ghprb.GhprbBranch>
+ <branch>testing</branch>
+ </org.jenkinsci.plugins.ghprb.GhprbBranch>
+ </blackListTargetBranches>
<gitHubAuthId>123-456-789</gitHubAuthId>
<extensions>
<org.jenkinsci.plugins.ghprb.extensions.status.GhprbSimpleStatus>
diff --git a/tests/triggers/fixtures/github-pull-request-full.yaml b/tests/triggers/fixtures/github-pull-request-full.yaml
index af50156f..11a70a36 100644
--- a/tests/triggers/fixtures/github-pull-request-full.yaml
+++ b/tests/triggers/fixtures/github-pull-request-full.yaml
@@ -27,6 +27,9 @@ triggers:
white-list-target-branches:
- master
- testing
+ black-list-target-branches:
+ - master
+ - testing
auth-id: '123-456-789'
status-context: "status context"
triggered-status: "triggered status message"