jjb/jenkins-job-builder
Code Issues Proposed changes

Merge "ssh-agent-credentials: Support ignore-missing-credentials param"

Browse Source
This commit is contained in:
Zuul 2018-07-31 00:42:40 +00:00 committed by Gerrit Code Review
commit 9428f49fe0
5 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jenkins_jobs/modules/wrappers.py
View File

@ -1752,6 +1752,8 @@ def ssh_agent_credentials(registry, xml_parent, data):
:arg list users: A list of Jenkins users credential IDs (required)
:arg str user: The user id of the jenkins user credentials (deprecated)
:arg bool ignore-missing-credentials: Specifies the option to ignore
missing credentials (default false)
Example:
@ -1812,6 +1814,12 @@ def ssh_agent_credentials(registry, xml_parent, data):
for user in user_list:
XML.SubElement(entry_xml, xml_key).text = user
mapping = [
('ignore-missing-credentials', 'ignoreMissing', False),
]
helpers.convert_mapping_to_xml(entry_xml, data, mapping,
fail_required=False)
def credentials_binding(registry, xml_parent, data):
"""yaml: credentials-binding

1
tests/wrappers/fixtures/ssh-agent-credentials001.xml
View File

@ -3,6 +3,7 @@
<buildWrappers>
<com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper>
<user>49d20745-9889-4c02-b286-fc6fb89c36bd</user>
<ignoreMissing>false</ignoreMissing>
</com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper>
</buildWrappers>
</project>

1
tests/wrappers/fixtures/ssh-agent-credentials002.xml
View File

@ -6,6 +6,7 @@
<string>44747833-247a-407a-a98f-a5a2d785111c</string>
<string>f1c0f777-7ac6-43fd-b5c7-68b420aa1392</string>
<string>dd647a01-be21-402b-bfc5-a4e89be7d0c4</string>
<ignoreMissing>false</ignoreMissing>
</credentialIds>
</com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper>
</buildWrappers>

1
tests/wrappers/fixtures/ssh-agent-credentials003.xml
View File

@ -5,6 +5,7 @@
<credentialIds>
<string>44747833-247a-407a-a98f-a5a2d785111c</string>
<string>dd647a01-be21-402b-bfc5-a4e89be7d0c4</string>
<ignoreMissing>false</ignoreMissing>
</credentialIds>
</com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper>
</buildWrappers>

1
tests/wrappers/fixtures/ssh-agent-credentials004.xml
View File

@ -3,6 +3,7 @@
<buildWrappers>
<com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper>
<user>49d20745-9889-4c02-b286-fc6fb89c36bd</user>
<ignoreMissing>false</ignoreMissing>
</com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper>
</buildWrappers>
</project>