wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't die when kernel memory accounting is not supported by runc build. (#53163)

Browse source 
(cherry picked from commit e4c2cbcca2)
This commit is contained in:
Felix Fontein 2019-03-01 12:04:39 +01:00 committed by Matt Clay
parent f56c3fdc89
commit 2c1381aeb5
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
test/integration/targets/docker_container/tasks/tests/options.yml
View file

@ -1495,6 +1495,7 @@
kernel_memory: 8M
state: started
register: kernel_memory_1
ignore_errors: yes
- name: kernel_memory (idempotency)
docker_container:
@ -1504,6 +1505,7 @@
kernel_memory: 8M
state: started
register: kernel_memory_2
ignore_errors: yes
- name: kernel_memory (change)
docker_container:
@ -1514,18 +1516,21 @@
state: started
stop_timeout: 1
register: kernel_memory_3
ignore_errors: yes
- name: cleanup
docker_container:
name: "{{ cname }}"
state: absent
stop_timeout: 1
ignore_errors: yes
- assert:
that:
- kernel_memory_1 is changed
- kernel_memory_2 is not changed
- kernel_memory_3 is changed
when: kernel_memory_1 is not failed or 'kernel memory accounting disabled in this runc build' not in kernel_memory_1.msg
####################################################################
## kill_signal #####################################################