From 55310657f0a81e08c806db0caf4179e2616515c7 Mon Sep 17 00:00:00 2001
From: tanhengyeow <E0032242@u.nus.edu>
Date: Mon, 17 Sep 2018 22:26:06 +0800
Subject: docker-custom-build-env: Add support for new options

Change-Id: I9482d2e3c98cf8058d5689cd688b8cc489bbb016
Signed-off-by: Tan Heng Yeow <E0032242@u.nus.edu>
Signed-off-by: Anil Belur <askb23@gmail.com>
---
 jenkins_jobs/modules/wrappers.py                        | 6 ++++++
 tests/wrappers/fixtures/docker-custom-build-env001.xml  | 2 ++
 tests/wrappers/fixtures/docker-custom-build-env001.yaml | 2 ++
 tests/wrappers/fixtures/docker-custom-build-env002.xml  | 2 ++
 4 files changed, 12 insertions(+)

diff --git a/jenkins_jobs/modules/wrappers.py b/jenkins_jobs/modules/wrappers.py
index 04635d66..71ec9f5e 100644
--- a/jenkins_jobs/modules/wrappers.py
+++ b/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)
diff --git a/tests/wrappers/fixtures/docker-custom-build-env001.xml b/tests/wrappers/fixtures/docker-custom-build-env001.xml
index b78b7466..be8f18ef 100644
--- a/tests/wrappers/fixtures/docker-custom-build-env001.xml
+++ b/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>
diff --git a/tests/wrappers/fixtures/docker-custom-build-env001.yaml b/tests/wrappers/fixtures/docker-custom-build-env001.yaml
index 2fc630f0..52446d8a 100644
--- a/tests/wrappers/fixtures/docker-custom-build-env001.yaml
+++ b/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
diff --git a/tests/wrappers/fixtures/docker-custom-build-env002.xml b/tests/wrappers/fixtures/docker-custom-build-env002.xml
index 9a9e4737..9a0bf4ad 100644
--- a/tests/wrappers/fixtures/docker-custom-build-env002.xml
+++ b/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>
-- 
cgit