mirror of
https://github.com/ansible-collections/community.docker.git
synced 2026-07-29 11:55:04 +00:00
Use FQCNs. (#1180)
This commit is contained in:
@@ -9,5 +9,5 @@
|
||||
####################################################################
|
||||
|
||||
- when: ansible_facts.distribution ~ ansible_facts.distribution_major_version not in ['CentOS6', 'RedHat6']
|
||||
include_tasks:
|
||||
ansible.builtin.include_tasks:
|
||||
file: test.yml
|
||||
|
||||
@@ -4,4 +4,4 @@
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
- name: "Loading tasks from {{ test_name }}"
|
||||
include_tasks: "{{ test_name }}"
|
||||
ansible.builtin.include_tasks: "{{ test_name }}"
|
||||
|
||||
@@ -4,18 +4,18 @@
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
- name: Create random name prefix
|
||||
set_fact:
|
||||
ansible.builtin.set_fact:
|
||||
name_prefix: "{{ 'ansible-docker-test-%0x' % ((2**32) | random) }}"
|
||||
- name: Create image and container list
|
||||
set_fact:
|
||||
ansible.builtin.set_fact:
|
||||
inames: []
|
||||
cnames: []
|
||||
|
||||
- debug:
|
||||
- ansible.builtin.debug:
|
||||
msg: "Using name prefix {{ name_prefix }}"
|
||||
|
||||
- block:
|
||||
- include_tasks: run-test.yml
|
||||
- ansible.builtin.include_tasks: run-test.yml
|
||||
with_fileglob:
|
||||
- "tests/*.yml"
|
||||
loop_control:
|
||||
@@ -23,11 +23,11 @@
|
||||
|
||||
always:
|
||||
- name: "Make sure all images are removed"
|
||||
docker_image_remove:
|
||||
community.docker.docker_image_remove:
|
||||
name: "{{ item }}"
|
||||
with_items: "{{ inames }}"
|
||||
- name: "Make sure all containers are removed"
|
||||
docker_container:
|
||||
community.docker.docker_container:
|
||||
name: "{{ item }}"
|
||||
state: absent
|
||||
force_kill: true
|
||||
@@ -35,5 +35,5 @@
|
||||
|
||||
when: docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_image tests!"
|
||||
- ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_image tests!"
|
||||
when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
- set_fact:
|
||||
- ansible.builtin.set_fact:
|
||||
image_names:
|
||||
- "{{ docker_test_image_hello_world }}"
|
||||
- "{{ docker_test_image_simple_1 }}"
|
||||
- "{{ docker_test_image_simple_2 }}"
|
||||
|
||||
- name: Make sure images are there
|
||||
docker_image_pull:
|
||||
community.docker.docker_image_pull:
|
||||
name: "{{ item }}"
|
||||
register: images
|
||||
loop: "{{ image_names }}"
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
block:
|
||||
- name: Create archives
|
||||
docker_image_export:
|
||||
community.docker.docker_image_export:
|
||||
names: "{{ item.images }}"
|
||||
path: "{{ remote_tmp_dir }}/{{ item.file }}"
|
||||
loop: "{{ image_tasks }}"
|
||||
@@ -46,14 +46,14 @@
|
||||
register: result
|
||||
|
||||
- name: Extract manifest.json files
|
||||
command: tar xvf "{{ remote_tmp_dir }}/{{ item.file }}" manifest.json --to-stdout
|
||||
ansible.builtin.command: tar xvf "{{ remote_tmp_dir }}/{{ item.file }}" manifest.json --to-stdout
|
||||
loop: "{{ image_tasks }}"
|
||||
loop_control:
|
||||
label: "{{ item.file }}"
|
||||
register: manifests
|
||||
|
||||
- name: Do basic tests
|
||||
assert:
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- item.0.images | length == item.1 | length
|
||||
- item.1 | unique | length == item.2 | length
|
||||
|
||||
Reference in New Issue
Block a user