diff options
| author | Zuul <zuul@review.openstack.org> | 2018-09-21 13:43:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-09-21 13:43:00 +0000 |
| commit | 192286d700a916131770488ca5d8df0f9012f5e3 (patch) | |
| tree | b7fa7f2609abc7c8a85b1be23acc58769b617f6e /tests | |
| parent | ed468042ba401212be018c9fbac586a7a383ddf3 (diff) | |
| parent | 55310657f0a81e08c806db0caf4179e2616515c7 (diff) | |
| download | python-jenkins-job-builder-192286d700a916131770488ca5d8df0f9012f5e3.tar.gz python-jenkins-job-builder-192286d700a916131770488ca5d8df0f9012f5e3.tar.xz python-jenkins-job-builder-192286d700a916131770488ca5d8df0f9012f5e3.zip | |
Merge "docker-custom-build-env: Add support for new options"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wrappers/fixtures/docker-custom-build-env001.xml | 2 | ||||
| -rw-r--r-- | tests/wrappers/fixtures/docker-custom-build-env001.yaml | 2 | ||||
| -rw-r--r-- | tests/wrappers/fixtures/docker-custom-build-env002.xml | 2 |
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<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> |