diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py index dc960957a..fbc90fb85 100644 --- a/jenkins_jobs/modules/publishers.py +++ b/jenkins_jobs/modules/publishers.py @@ -4890,6 +4890,9 @@ def s3(registry, xml_parent, data): * **flatten** (`bool`) - Ignore the directory structure of the artifacts in the source project and copy all matching artifacts 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: :metadata-tags: * **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), ('managedArtifacts', 'managed-artifacts', 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: xml_config = XML.SubElement(fileset, xml_key) diff --git a/tests/publishers/fixtures/s3001.xml b/tests/publishers/fixtures/s3001.xml index 0e3ffc483..81a397282 100644 --- a/tests/publishers/fixtures/s3001.xml +++ b/tests/publishers/fixtures/s3001.xml @@ -14,6 +14,7 @@ true true true + true diff --git a/tests/publishers/fixtures/s3001.yaml b/tests/publishers/fixtures/s3001.yaml index 9d7bfabf2..663a9735a 100644 --- a/tests/publishers/fixtures/s3001.yaml +++ b/tests/publishers/fixtures/s3001.yaml @@ -11,6 +11,7 @@ publishers: managed-artifacts: true s3-encryption: true flatten: true + dont-wait-for-concurrent-builds: true metadata-tags: - key: warbl ${garbl} value: herp derp weevils