From fada164a7da21e5e3c4b885ec95a4b72eaa87b4e Mon Sep 17 00:00:00 2001 From: tanhengyeow Date: Fri, 27 Jul 2018 21:45:37 +0800 Subject: [PATCH] ssh-agent-credentials: Support ignore-missing-credentials param Change-Id: I5f78648600ef045dfe539a950daae14b304a74d9 Signed-off-by: Tan Heng Yeow --- jenkins_jobs/modules/wrappers.py | 8 ++++++++ tests/wrappers/fixtures/ssh-agent-credentials001.xml | 1 + tests/wrappers/fixtures/ssh-agent-credentials002.xml | 1 + tests/wrappers/fixtures/ssh-agent-credentials003.xml | 1 + tests/wrappers/fixtures/ssh-agent-credentials004.xml | 1 + 5 files changed, 12 insertions(+) diff --git a/jenkins_jobs/modules/wrappers.py b/jenkins_jobs/modules/wrappers.py index 3f2901e32..d8f33344b 100644 --- a/jenkins_jobs/modules/wrappers.py +++ b/jenkins_jobs/modules/wrappers.py @@ -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 diff --git a/tests/wrappers/fixtures/ssh-agent-credentials001.xml b/tests/wrappers/fixtures/ssh-agent-credentials001.xml index 48ad908b4..0fe0d9007 100644 --- a/tests/wrappers/fixtures/ssh-agent-credentials001.xml +++ b/tests/wrappers/fixtures/ssh-agent-credentials001.xml @@ -3,6 +3,7 @@ 49d20745-9889-4c02-b286-fc6fb89c36bd + false diff --git a/tests/wrappers/fixtures/ssh-agent-credentials002.xml b/tests/wrappers/fixtures/ssh-agent-credentials002.xml index 1b9e1d1b5..2b6f9fe6f 100644 --- a/tests/wrappers/fixtures/ssh-agent-credentials002.xml +++ b/tests/wrappers/fixtures/ssh-agent-credentials002.xml @@ -6,6 +6,7 @@ 44747833-247a-407a-a98f-a5a2d785111c f1c0f777-7ac6-43fd-b5c7-68b420aa1392 dd647a01-be21-402b-bfc5-a4e89be7d0c4 + false diff --git a/tests/wrappers/fixtures/ssh-agent-credentials003.xml b/tests/wrappers/fixtures/ssh-agent-credentials003.xml index cc332cf4a..ab9fad817 100644 --- a/tests/wrappers/fixtures/ssh-agent-credentials003.xml +++ b/tests/wrappers/fixtures/ssh-agent-credentials003.xml @@ -5,6 +5,7 @@ 44747833-247a-407a-a98f-a5a2d785111c dd647a01-be21-402b-bfc5-a4e89be7d0c4 + false diff --git a/tests/wrappers/fixtures/ssh-agent-credentials004.xml b/tests/wrappers/fixtures/ssh-agent-credentials004.xml index 48ad908b4..0fe0d9007 100644 --- a/tests/wrappers/fixtures/ssh-agent-credentials004.xml +++ b/tests/wrappers/fixtures/ssh-agent-credentials004.xml @@ -3,6 +3,7 @@ 49d20745-9889-4c02-b286-fc6fb89c36bd + false