mirror of https://github.com/ansible/ansible.git
Make docker swarm integration tests more reliable (#59473)
parent
723da33176
commit
3ceeae0de9
@ -0,0 +1,35 @@
|
||||
- name: CLEANUP | Leave Docker Swarm
|
||||
docker_swarm:
|
||||
state: absent
|
||||
force: true
|
||||
ignore_errors: yes
|
||||
register: leave_swarm
|
||||
|
||||
- name: CLEANUP | Kill Docker and cleanup
|
||||
when: leave_swarm is failed
|
||||
block:
|
||||
- name: CLEANUP | Kill docker daemon
|
||||
command: systemctl kill -s 9 docker
|
||||
become: yes
|
||||
|
||||
- name: CLEANUP | Clear out /var/lib/docker
|
||||
shell: rm -rf /var/lib/docker/*
|
||||
args:
|
||||
warn: no
|
||||
|
||||
- name: CLEANUP | Start docker daemon
|
||||
service:
|
||||
name: docker
|
||||
state: started
|
||||
become: yes
|
||||
|
||||
- name: CLEANUP | Wait for docker daemon to be fully started
|
||||
command: docker ps
|
||||
register: result
|
||||
until: result is success
|
||||
retries: 10
|
||||
|
||||
- name: CLEANUP | Leave Docker Swarm
|
||||
docker_swarm:
|
||||
state: absent
|
||||
force: true
|
@ -1,38 +1,18 @@
|
||||
---
|
||||
# Run the tests
|
||||
- block:
|
||||
- include_tasks: run-test.yml
|
||||
with_fileglob:
|
||||
- "tests/*.yml"
|
||||
- name: Run Docker Swarm tests
|
||||
when:
|
||||
- docker_py_version is version('1.10.0', '>=')
|
||||
- docker_api_version is version('1.25', '>=')
|
||||
|
||||
always:
|
||||
- name: Cleanup (trying)
|
||||
docker_swarm:
|
||||
state: absent
|
||||
force: true
|
||||
diff: no
|
||||
ignore_errors: yes
|
||||
|
||||
- name: Kill docker daemon
|
||||
command: systemctl kill -s 9 docker
|
||||
become: yes
|
||||
|
||||
- name: Restart docker daemon
|
||||
service:
|
||||
name: docker
|
||||
state: restarted
|
||||
become: yes
|
||||
block:
|
||||
- include_tasks: "{{ item }}"
|
||||
with_fileglob:
|
||||
- 'tests/*.yml'
|
||||
|
||||
- name: Wait for docker daemon to be fully restarted
|
||||
command: docker ps
|
||||
|
||||
- name: Cleanup
|
||||
docker_swarm:
|
||||
state: absent
|
||||
force: true
|
||||
diff: no
|
||||
|
||||
when: docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
always:
|
||||
- import_tasks: cleanup.yml
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_swarm tests!"
|
||||
when: not(docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
- fail:
|
||||
msg: "Too old docker / docker-py version to run docker_swarm tests!"
|
||||
when:
|
||||
- not(docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>='))
|
||||
- (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
|
@ -1,8 +0,0 @@
|
||||
---
|
||||
- name: Make sure we're not already using Docker swarm
|
||||
docker_swarm:
|
||||
state: absent
|
||||
force: true
|
||||
diff: no
|
||||
- name: "Loading tasks from {{ item }}"
|
||||
include_tasks: "{{ item }}"
|
Loading…
Reference in New Issue