diff options
12 files changed, 35 insertions, 28 deletions
diff --git a/jenkins_jobs/modules/builders.py b/jenkins_jobs/modules/builders.py index 9cf9bdf2..8a26fbe8 100644 --- a/jenkins_jobs/modules/builders.py +++ b/jenkins_jobs/modules/builders.py @@ -2154,10 +2154,16 @@ def config_file_provider(registry, xml_parent, data): example "password: ${PYPI_JENKINS_PASS}" will be replaced with the global variable configured in Jenkins. - Example: + Full Example: + + .. literalinclude:: + ../../tests/builders/fixtures/config-file-provider-full.yaml + :language: yaml + + Minimal Example: .. literalinclude:: - ../../tests/builders/fixtures/config-file-provider01.yaml + ../../tests/builders/fixtures/config-file-provider-minimal.yaml :language: yaml """ cfp = XML.SubElement(xml_parent, diff --git a/jenkins_jobs/modules/wrappers.py b/jenkins_jobs/modules/wrappers.py index 04635d66..32a89df3 100644 --- a/jenkins_jobs/modules/wrappers.py +++ b/jenkins_jobs/modules/wrappers.py @@ -208,11 +208,15 @@ def config_file_provider(registry, xml_parent, data): For example "password: ${PYPI_JENKINS_PASS}" will be replaced with the global variable configured in Jenkins. - Example: + Full Example: - .. literalinclude:: \ - /../../tests/wrappers/fixtures/config-file-provider003.yaml - :language: yaml + .. literalinclude:: + /../../tests/wrappers/fixtures/config-file-provider-full.yaml + + Minimal Example: + + .. literalinclude:: + /../../tests/wrappers/fixtures/config-file-provider-minimal.yaml """ cfp = XML.SubElement(xml_parent, 'org.jenkinsci.plugins.configfiles.' 'buildwrapper.ConfigFileBuildWrapper') diff --git a/tests/builders/fixtures/config-file-provider01.xml b/tests/builders/fixtures/config-file-provider-full.xml index 9e8ecad1..9e8ecad1 100644 --- a/tests/builders/fixtures/config-file-provider01.xml +++ b/tests/builders/fixtures/config-file-provider-full.xml diff --git a/tests/builders/fixtures/config-file-provider01.yaml b/tests/builders/fixtures/config-file-provider-full.yaml index aa404270..aa404270 100644 --- a/tests/builders/fixtures/config-file-provider01.yaml +++ b/tests/builders/fixtures/config-file-provider-full.yaml diff --git a/tests/builders/fixtures/config-file-provider-minimal.xml b/tests/builders/fixtures/config-file-provider-minimal.xml new file mode 100644 index 00000000..1df1859b --- /dev/null +++ b/tests/builders/fixtures/config-file-provider-minimal.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <builders> + <org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep plugin="config-file-provider"> + <managedFiles> + <org.jenkinsci.plugins.configfiles.buildwrapper.ManagedFile> + <fileId>org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig0123456789012</fileId> + <targetLocation/> + <variable/> + <replaceTokens>false</replaceTokens> + </org.jenkinsci.plugins.configfiles.buildwrapper.ManagedFile> + </managedFiles> + </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep> + </builders> +</project> diff --git a/tests/builders/fixtures/config-file-provider-minimal.yaml b/tests/builders/fixtures/config-file-provider-minimal.yaml new file mode 100644 index 00000000..0b5fe406 --- /dev/null +++ b/tests/builders/fixtures/config-file-provider-minimal.yaml @@ -0,0 +1,4 @@ +builders: + - config-file-provider: + files: + - file-id: org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig0123456789012 diff --git a/tests/wrappers/fixtures/config-file-provider003.xml b/tests/wrappers/fixtures/config-file-provider-full.xml index d8f9a0a5..d8f9a0a5 100644 --- a/tests/wrappers/fixtures/config-file-provider003.xml +++ b/tests/wrappers/fixtures/config-file-provider-full.xml diff --git a/tests/wrappers/fixtures/config-file-provider003.yaml b/tests/wrappers/fixtures/config-file-provider-full.yaml index 6f65ab56..6f65ab56 100644 --- a/tests/wrappers/fixtures/config-file-provider003.yaml +++ b/tests/wrappers/fixtures/config-file-provider-full.yaml diff --git a/tests/wrappers/fixtures/config-file-provider002.xml b/tests/wrappers/fixtures/config-file-provider-minimal.xml index d10b964a..d10b964a 100644 --- a/tests/wrappers/fixtures/config-file-provider002.xml +++ b/tests/wrappers/fixtures/config-file-provider-minimal.xml diff --git a/tests/wrappers/fixtures/config-file-provider002.yaml b/tests/wrappers/fixtures/config-file-provider-minimal.yaml index d2b6caea..d2b6caea 100644 --- a/tests/wrappers/fixtures/config-file-provider002.yaml +++ b/tests/wrappers/fixtures/config-file-provider-minimal.yaml diff --git a/tests/wrappers/fixtures/config-file-provider001.xml b/tests/wrappers/fixtures/config-file-provider001.xml deleted file mode 100644 index 09d77291..00000000 --- a/tests/wrappers/fixtures/config-file-provider001.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<project> - <buildWrappers> - <org.jenkinsci.plugins.configfiles.buildwrapper.ConfigFileBuildWrapper plugin="config-file-provider"> - <managedFiles> - <org.jenkinsci.plugins.configfiles.buildwrapper.ManagedFile> - <fileId>org.jenkinsci.plugins.configfiles.custom.CustomConfig1409250932722</fileId> - <targetLocation>tmp/bar.txt</targetLocation> - <variable>varname</variable> - <replaceTokens>true</replaceTokens> - </org.jenkinsci.plugins.configfiles.buildwrapper.ManagedFile> - </managedFiles> - </org.jenkinsci.plugins.configfiles.buildwrapper.ConfigFileBuildWrapper> - </buildWrappers> -</project> diff --git a/tests/wrappers/fixtures/config-file-provider001.yaml b/tests/wrappers/fixtures/config-file-provider001.yaml deleted file mode 100644 index f02c3142..00000000 --- a/tests/wrappers/fixtures/config-file-provider001.yaml +++ /dev/null @@ -1,7 +0,0 @@ -wrappers: - - config-file-provider: - files: - - file-id: org.jenkinsci.plugins.configfiles.custom.CustomConfig1409250932722 - target: tmp/bar.txt - variable: varname - replace-tokens: true |