From 2c1381aeb5418471f87d645baac9fed0bcc3d4f6 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Fri, 1 Mar 2019 12:04:39 +0100
Subject: [PATCH] Don't die when kernel memory accounting is not supported by
 runc build. (#53163)

(cherry picked from commit e4c2cbcca2f549234b9aba8cf6e532ef9e3c4d62)
---
 .../targets/docker_container/tasks/tests/options.yml         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/integration/targets/docker_container/tasks/tests/options.yml b/test/integration/targets/docker_container/tasks/tests/options.yml
index 51f17744bc7..a3746ebe501 100644
--- a/test/integration/targets/docker_container/tasks/tests/options.yml
+++ b/test/integration/targets/docker_container/tasks/tests/options.yml
@@ -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 #####################################################