Add support for new option in s3 plugin.

Change-Id: I294576b9c5083b8a56cdf53e682b6eecabf7e166
Task: 4223
Story: 2001025
This commit is contained in:
Ruan Jonker 2017-05-12 11:50:39 +02:00 committed by Ruan Jonker
parent 4fb2dd1200
commit 4b81ba5ab7
3 changed files with 8 additions and 1 deletions

View File

@ -4890,6 +4890,9 @@ def s3(registry, xml_parent, data):
* **flatten** (`bool`) - Ignore the directory structure of the * **flatten** (`bool`) - Ignore the directory structure of the
artifacts in the source project and copy all matching artifacts artifacts in the source project and copy all matching artifacts
directly into the specified bucket. (default false) directly into the specified bucket. (default false)
* **dont-wait-for-concurrent-builds** (`bool`) - Don't wait
for completion of concurrent builds before publishing to S3
(default false)
:arg list metadata-tags: :arg list metadata-tags:
:metadata-tags: :metadata-tags:
* **key** Metadata key for files from this build. It will be * **key** Metadata key for files from this build. It will be
@ -4923,7 +4926,9 @@ def s3(registry, xml_parent, data):
('uploadFromSlave', 'upload-from-slave', False), ('uploadFromSlave', 'upload-from-slave', False),
('managedArtifacts', 'managed-artifacts', False), ('managedArtifacts', 'managed-artifacts', False),
('useServerSideEncryption', 's3-encryption', False), ('useServerSideEncryption', 's3-encryption', False),
('flatten', 'flatten', False)] ('flatten', 'flatten', False),
('dontWaitForConcurrentBuildCompletion',
'dont-wait-for-concurrent-builds', False)]
for xml_key, yaml_key, default in settings: for xml_key, yaml_key, default in settings:
xml_config = XML.SubElement(fileset, xml_key) xml_config = XML.SubElement(fileset, xml_key)

View File

@ -14,6 +14,7 @@
<managedArtifacts>true</managedArtifacts> <managedArtifacts>true</managedArtifacts>
<useServerSideEncryption>true</useServerSideEncryption> <useServerSideEncryption>true</useServerSideEncryption>
<flatten>true</flatten> <flatten>true</flatten>
<dontWaitForConcurrentBuildCompletion>true</dontWaitForConcurrentBuildCompletion>
</hudson.plugins.s3.Entry> </hudson.plugins.s3.Entry>
</entries> </entries>
<userMetadata> <userMetadata>

View File

@ -11,6 +11,7 @@ publishers:
managed-artifacts: true managed-artifacts: true
s3-encryption: true s3-encryption: true
flatten: true flatten: true
dont-wait-for-concurrent-builds: true
metadata-tags: metadata-tags:
- key: warbl ${garbl} - key: warbl ${garbl}
value: herp derp weevils value: herp derp weevils