summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-29 18:16:19 +0000
committerGerrit Code Review <review@openstack.org>2018-10-29 18:16:19 +0000
commita8830087db1504651c7825aa3c814939d711afd6 (patch)
treee1cb1e00d386bdda425dbc8e9bba5858976bd486 /tests
parent10670775262d4d1060a66c8b85c58acf5310b965 (diff)
parent1ee893d595b3490cede8b3d80736897182ed15bb (diff)
downloadpython-jenkins-job-builder-a8830087db1504651c7825aa3c814939d711afd6.tar.gz
python-jenkins-job-builder-a8830087db1504651c7825aa3c814939d711afd6.tar.xz
python-jenkins-job-builder-a8830087db1504651c7825aa3c814939d711afd6.zip
Merge "Add 'secret-token' parameter to gitlab trigger"
Diffstat (limited to 'tests')
-rw-r--r--tests/triggers/fixtures/gitlab001.xml1
-rw-r--r--tests/triggers/fixtures/gitlab002.xml1
-rw-r--r--tests/triggers/fixtures/gitlab003.xml1
-rw-r--r--tests/triggers/fixtures/gitlab004.xml1
-rw-r--r--tests/triggers/fixtures/gitlab005.xml1
-rw-r--r--tests/triggers/fixtures/gitlab006.xml1
-rw-r--r--tests/triggers/fixtures/gitlab006.yaml1
-rw-r--r--tests/triggers/fixtures/gitlab007.xml1
-rw-r--r--tests/triggers/fixtures/gitlab008.xml1
9 files changed, 9 insertions, 0 deletions
diff --git a/tests/triggers/fixtures/gitlab001.xml b/tests/triggers/fixtures/gitlab001.xml
index 012c4b9f..8ae8e77d 100644
--- a/tests/triggers/fixtures/gitlab001.xml
+++ b/tests/triggers/fixtures/gitlab001.xml
@@ -20,6 +20,7 @@
<addCiMessage>true</addCiMessage>
<allowAllBranches>true</allowAllBranches>
<targetBranchRegex/>
+ <secretToken/>
<includeBranchesSpec>master, master2, local-test</includeBranchesSpec>
<excludeBranchesSpec>broken-test, master-foo</excludeBranchesSpec>
</com.dabsquared.gitlabjenkins.GitLabPushTrigger>
diff --git a/tests/triggers/fixtures/gitlab002.xml b/tests/triggers/fixtures/gitlab002.xml
index cf08f3ce..5d150f09 100644
--- a/tests/triggers/fixtures/gitlab002.xml
+++ b/tests/triggers/fixtures/gitlab002.xml
@@ -20,6 +20,7 @@
<addCiMessage>false</addCiMessage>
<allowAllBranches>false</allowAllBranches>
<targetBranchRegex/>
+ <secretToken/>
<includeBranchesSpec>master</includeBranchesSpec>
<excludeBranchesSpec>feature</excludeBranchesSpec>
</com.dabsquared.gitlabjenkins.GitLabPushTrigger>
diff --git a/tests/triggers/fixtures/gitlab003.xml b/tests/triggers/fixtures/gitlab003.xml
index 609180d5..0dc1cdd9 100644
--- a/tests/triggers/fixtures/gitlab003.xml
+++ b/tests/triggers/fixtures/gitlab003.xml
@@ -20,6 +20,7 @@
<addCiMessage>false</addCiMessage>
<allowAllBranches>false</allowAllBranches>
<targetBranchRegex/>
+ <secretToken/>
<includeBranchesSpec>master</includeBranchesSpec>
<excludeBranchesSpec>baz, foo, fnord</excludeBranchesSpec>
</com.dabsquared.gitlabjenkins.GitLabPushTrigger>
diff --git a/tests/triggers/fixtures/gitlab004.xml b/tests/triggers/fixtures/gitlab004.xml
index 5dcaeaa2..01101568 100644
--- a/tests/triggers/fixtures/gitlab004.xml
+++ b/tests/triggers/fixtures/gitlab004.xml
@@ -20,6 +20,7 @@
<addCiMessage>true</addCiMessage>
<allowAllBranches>true</allowAllBranches>
<targetBranchRegex/>
+ <secretToken/>
<includeBranchesSpec>master, master2, local-test</includeBranchesSpec>
<excludeBranchesSpec>broken-test, master-foo</excludeBranchesSpec>
</com.dabsquared.gitlabjenkins.GitLabPushTrigger>
diff --git a/tests/triggers/fixtures/gitlab005.xml b/tests/triggers/fixtures/gitlab005.xml
index 2daa009b..7d19cb50 100644
--- a/tests/triggers/fixtures/gitlab005.xml
+++ b/tests/triggers/fixtures/gitlab005.xml
@@ -20,6 +20,7 @@
<addCiMessage>false</addCiMessage>
<allowAllBranches>false</allowAllBranches>
<targetBranchRegex/>
+ <secretToken/>
<includeBranchesSpec/>
<excludeBranchesSpec/>
</com.dabsquared.gitlabjenkins.GitLabPushTrigger>
diff --git a/tests/triggers/fixtures/gitlab006.xml b/tests/triggers/fixtures/gitlab006.xml
index c83293e4..5d6e5999 100644
--- a/tests/triggers/fixtures/gitlab006.xml
+++ b/tests/triggers/fixtures/gitlab006.xml
@@ -20,6 +20,7 @@
<addCiMessage>true</addCiMessage>
<allowAllBranches>false</allowAllBranches>
<targetBranchRegex>(.*debug.*|.*release.*)</targetBranchRegex>
+ <secretToken>secret-build-token</secretToken>
<includeBranchesSpec>include1, include2</includeBranchesSpec>
<excludeBranchesSpec>exclude1, exclude2</excludeBranchesSpec>
</com.dabsquared.gitlabjenkins.GitLabPushTrigger>
diff --git a/tests/triggers/fixtures/gitlab006.yaml b/tests/triggers/fixtures/gitlab006.yaml
index bb84e73d..12d97da1 100644
--- a/tests/triggers/fixtures/gitlab006.yaml
+++ b/tests/triggers/fixtures/gitlab006.yaml
@@ -20,3 +20,4 @@ triggers:
- exclude1
- exclude2
target-branch-regex: '(.*debug.*|.*release.*)'
+ secret-token: 'secret-build-token'
diff --git a/tests/triggers/fixtures/gitlab007.xml b/tests/triggers/fixtures/gitlab007.xml
index f7611fd6..4efe9509 100644
--- a/tests/triggers/fixtures/gitlab007.xml
+++ b/tests/triggers/fixtures/gitlab007.xml
@@ -20,6 +20,7 @@
<addCiMessage>true</addCiMessage>
<allowAllBranches>true</allowAllBranches>
<targetBranchRegex/>
+ <secretToken/>
<includeBranchesSpec>master, master2, local-test</includeBranchesSpec>
<excludeBranchesSpec>broken-test, master-foo</excludeBranchesSpec>
</com.dabsquared.gitlabjenkins.GitLabPushTrigger>
diff --git a/tests/triggers/fixtures/gitlab008.xml b/tests/triggers/fixtures/gitlab008.xml
index dcb2b4d3..a7281cc5 100644
--- a/tests/triggers/fixtures/gitlab008.xml
+++ b/tests/triggers/fixtures/gitlab008.xml
@@ -20,6 +20,7 @@
<addCiMessage>true</addCiMessage>
<allowAllBranches>false</allowAllBranches>
<targetBranchRegex/>
+ <secretToken/>
<includeBranchesSpec/>
<excludeBranchesSpec/>
</com.dabsquared.gitlabjenkins.GitLabPushTrigger>