summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-17 19:38:18 +0000
committerGerrit Code Review <review@openstack.org>2018-10-17 19:38:18 +0000
commitc4623620ae3ffede40cde7519e4ccb4c82a8350b (patch)
tree1eba30e5c93d2d404acaa9a955527f2769e77aa4 /tests
parenta4141eed845633d666f0b5ba4c792b69dbae5243 (diff)
parentdab315646516c4570d165c27377301ddaf65a3ff (diff)
downloadpython-jenkins-job-builder-c4623620ae3ffede40cde7519e4ccb4c82a8350b.tar.gz
python-jenkins-job-builder-c4623620ae3ffede40cde7519e4ccb4c82a8350b.tar.xz
python-jenkins-job-builder-c4623620ae3ffede40cde7519e4ccb4c82a8350b.zip
Merge "Adds option to specify secret id for github"
Diffstat (limited to 'tests')
-rw-r--r--tests/multibranch/fixtures/scm_github_full.xml4
-rw-r--r--tests/multibranch/fixtures/scm_github_full.yaml3
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/multibranch/fixtures/scm_github_full.xml b/tests/multibranch/fixtures/scm_github_full.xml
index ea8eee0d..2802182e 100644
--- a/tests/multibranch/fixtures/scm_github_full.xml
+++ b/tests/multibranch/fixtures/scm_github_full.xml
@@ -41,7 +41,9 @@
<org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait>
<strategyId>3</strategyId>
</org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait>
- <org.jenkinsci.plugins.github__branch__source.SSHCheckoutTrait/>
+ <org.jenkinsci.plugins.github__branch__source.SSHCheckoutTrait>
+ <credentialsId>ssh_secret</credentialsId>
+ </org.jenkinsci.plugins.github__branch__source.SSHCheckoutTrait>
<org.jenkinsci.plugins.github__branch__source.TagDiscoveryTrait/>
<org.jenkinsci.plugins.github__branch__source.ForkPullRequestDiscoveryTrait>
<strategyId>3</strategyId>
diff --git a/tests/multibranch/fixtures/scm_github_full.yaml b/tests/multibranch/fixtures/scm_github_full.yaml
index d94da6fc..272d5f12 100644
--- a/tests/multibranch/fixtures/scm_github_full.yaml
+++ b/tests/multibranch/fixtures/scm_github_full.yaml
@@ -4,7 +4,8 @@ script-path: some.Jenkinsfile
scm:
- github:
api-uri: http://example.org/github
- ssh-checkout: true
+ ssh-checkout:
+ credentials: 'ssh_secret'
repo: example-repo
repo-owner: example-owner
credentials-id: example-credential