summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authortanhengyeow <E0032242@u.nus.edu>2018-09-17 22:26:06 +0800
committerAnil Belur <askb23@gmail.com>2018-09-21 18:38:31 +0530
commit55310657f0a81e08c806db0caf4179e2616515c7 (patch)
treee1e1801341231df0ec81e3cd3ddb9cdf79458252 /tests
parent4d5397c496abc1097d7214dafee5f16d7f49e066 (diff)
downloadpython-jenkins-job-builder-55310657f0a81e08c806db0caf4179e2616515c7.tar.gz
python-jenkins-job-builder-55310657f0a81e08c806db0caf4179e2616515c7.tar.xz
python-jenkins-job-builder-55310657f0a81e08c806db0caf4179e2616515c7.zip
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>
Diffstat (limited to 'tests')
-rw-r--r--tests/wrappers/fixtures/docker-custom-build-env001.xml2
-rw-r--r--tests/wrappers/fixtures/docker-custom-build-env001.yaml2
-rw-r--r--tests/wrappers/fixtures/docker-custom-build-env002.xml2
3 files changed, 6 insertions, 0 deletions
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>