From 2bf46c2eb289bb5ce03638429b35207ead933cb0 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Fri, 11 Dec 2020 21:12:48 +0100 Subject: [PATCH] Fix docker_image test. (#47) ci_complete --- .../targets/docker_image/tasks/tests/options.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/integration/targets/docker_image/tasks/tests/options.yml b/tests/integration/targets/docker_image/tasks/tests/options.yml index 9ae93031..e308bb1a 100644 --- a/tests/integration/targets/docker_image/tasks/tests/options.yml +++ b/tests/integration/targets/docker_image/tasks/tests/options.yml @@ -84,8 +84,8 @@ build: path: "{{ output_dir }}/files" container_limits: - memory: 5000000 - memswap: 7000000 + memory: 7000000 + memswap: 8000000 pull: no source: build register: container_limits_2 @@ -101,10 +101,10 @@ # It *sometimes* happens that the first task does not fail. # For now, we work around this by # a) requiring that if it fails, the message must - # contain 'Minimum memory limit allowed is 4MB', and + # contain 'Minimum memory limit allowed is (4|6)MB', and # b) requiring that either the first task, or the second # task is changed, but not both. - - "not container_limits_1 is failed or ('Minimum memory limit allowed is 4MB') in container_limits_1.msg" + - "not container_limits_1 is failed or ('Minimum memory limit allowed is ') in container_limits_1.msg" - "container_limits_1 is changed or container_limits_2 is changed and not (container_limits_1 is changed and container_limits_2 is changed)" ####################################################################