summaryrefslogtreecommitdiff
path: root/test/integration/targets/docker_container
diff options
context:
space:
mode:
authorFelix Fontein <felix@fontein.de>2019-05-05 12:13:55 +0200
committeransibot <ansibot@users.noreply.github.com>2019-05-05 06:13:55 -0400
commitf692261ea01032ffc6bdc55a6cd1794928dd89cf (patch)
treef54b4548054093aa9686a3d760f88a681c0be58a /test/integration/targets/docker_container
parent59d20e004e0e76b7746bb2047dd3815d9bbfcdf1 (diff)
downloadansible-f692261ea01032ffc6bdc55a6cd1794928dd89cf.tar.gz
oom_killer and oom_score_adj are available since docker-py 1.8.0. (#56012)
* oom_killer and oom_score_adj are available since docker-py 1.8.0. * Add changelog.
Diffstat (limited to 'test/integration/targets/docker_container')
-rw-r--r--test/integration/targets/docker_container/tasks/tests/options.yml18
1 files changed, 0 insertions, 18 deletions
diff --git a/test/integration/targets/docker_container/tasks/tests/options.yml b/test/integration/targets/docker_container/tasks/tests/options.yml
index 41e954d79a..cb3c901657 100644
--- a/test/integration/targets/docker_container/tasks/tests/options.yml
+++ b/test/integration/targets/docker_container/tasks/tests/options.yml
@@ -2438,7 +2438,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings"
oom_killer: yes
state: started
register: oom_killer_1
- ignore_errors: yes
- name: oom_killer (idempotency)
docker_container:
@@ -2448,7 +2447,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings"
oom_killer: yes
state: started
register: oom_killer_2
- ignore_errors: yes
- name: oom_killer (change)
docker_container:
@@ -2459,7 +2457,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings"
state: started
force_kill: yes
register: oom_killer_3
- ignore_errors: yes
- name: cleanup
docker_container:
@@ -2473,12 +2470,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings"
- oom_killer_1 is changed
- oom_killer_2 is not changed
- oom_killer_3 is changed
- when: docker_py_version is version('2.0.0', '>=')
-- assert:
- that:
- - oom_killer_1 is failed
- - "('version is ' ~ docker_py_version ~'. Minimum version required is 2.0.0') in oom_killer_1.msg"
- when: docker_py_version is version('2.0.0', '<')
####################################################################
## oom_score_adj ###################################################
@@ -2492,7 +2483,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings"
oom_score_adj: 5
state: started
register: oom_score_adj_1
- ignore_errors: yes
- name: oom_score_adj (idempotency)
docker_container:
@@ -2502,7 +2492,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings"
oom_score_adj: 5
state: started
register: oom_score_adj_2
- ignore_errors: yes
- name: oom_score_adj (change)
docker_container:
@@ -2513,7 +2502,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings"
state: started
force_kill: yes
register: oom_score_adj_3
- ignore_errors: yes
- name: cleanup
docker_container:
@@ -2527,12 +2515,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings"
- oom_score_adj_1 is changed
- oom_score_adj_2 is not changed
- oom_score_adj_3 is changed
- when: docker_py_version is version('2.0.0', '>=')
-- assert:
- that:
- - oom_score_adj_1 is failed
- - "('version is ' ~ docker_py_version ~'. Minimum version required is 2.0.0') in oom_score_adj_1.msg"
- when: docker_py_version is version('2.0.0', '<')
####################################################################
## output_logs #####################################################