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

(cherry picked from commit e4c2cbcca2)
pull/53192/head
Felix Fontein 7 years ago committed by Matt Clay
parent f56c3fdc89
commit 2c1381aeb5

@ -1495,6 +1495,7 @@
kernel_memory: 8M kernel_memory: 8M
state: started state: started
register: kernel_memory_1 register: kernel_memory_1
ignore_errors: yes
- name: kernel_memory (idempotency) - name: kernel_memory (idempotency)
docker_container: docker_container:
@ -1504,6 +1505,7 @@
kernel_memory: 8M kernel_memory: 8M
state: started state: started
register: kernel_memory_2 register: kernel_memory_2
ignore_errors: yes
- name: kernel_memory (change) - name: kernel_memory (change)
docker_container: docker_container:
@ -1514,18 +1516,21 @@
state: started state: started
stop_timeout: 1 stop_timeout: 1
register: kernel_memory_3 register: kernel_memory_3
ignore_errors: yes
- name: cleanup - name: cleanup
docker_container: docker_container:
name: "{{ cname }}" name: "{{ cname }}"
state: absent state: absent
stop_timeout: 1 stop_timeout: 1
ignore_errors: yes
- assert: - assert:
that: that:
- kernel_memory_1 is changed - kernel_memory_1 is changed
- kernel_memory_2 is not changed - kernel_memory_2 is not changed
- kernel_memory_3 is 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 ##################################################### ## kill_signal #####################################################

Loading…
Cancel
Save