Merge "docker-custom-build-env: Add support for new options"

jenkins_jobs/modules/wrappers.py

@@ -68,6 +68,10 @@ def docker_custom_build_env(registry, xml_parent, data):
         permission set
     :arg str command: Container start command (default '/bin/cat')
     :arg str net: Network bridge (default 'bridge')
+    :arg str memory-limit: Configure the limit memory
+        constraint (default '')
+    :arg str cpu-shares: Configure the CPU shares
+        constraint (default '')
 
     .. _image_types:
 
@@ -152,6 +156,8 @@ def docker_custom_build_env(registry, xml_parent, data):
         ('group', 'group', ''),
         ('command', 'command', '/bin/cat'),
         ('net', 'net', 'bridge'),
+        ('memory-limit', 'memory', ''),
+        ('cpu-shares', 'cpu', ''),
     ]
     helpers.convert_mapping_to_xml(
         entry_xml, data, mapping, fail_required=True)

tests/wrappers/fixtures/docker-custom-build-env001.xml

@@ -15,6 +15,8 @@
       <group>jenkins</group>
       <command>/bin/cat</command>
       <net>bridge</net>
+      <memory>memory=L&lt;inf, memory-swap=inf</memory>
+      <cpu>2</cpu>
     </com.cloudbees.jenkins.plugins.okidocki.DockerBuildWrapper>
   </buildWrappers>
 </project>

tests/wrappers/fixtures/docker-custom-build-env001.yaml

@@ -8,3 +8,5 @@ wrappers:
       group: jenkins
       command: /bin/cat
       net: bridge
+      memory-limit: memory=L<inf, memory-swap=inf
+      cpu-shares: 2

tests/wrappers/fixtures/docker-custom-build-env002.xml

@@ -28,6 +28,8 @@
       <group/>
       <command>/bin/cat</command>
       <net>bridge</net>
+      <memory/>
+      <cpu/>
     </com.cloudbees.jenkins.plugins.okidocki.DockerBuildWrapper>
   </buildWrappers>
 </project>