diff --git a/test/integration/targets/podman_image/aliases b/test/integration/targets/podman_image/aliases index dbb5f37dd3e3b5..1e2b2ce41baf81 100644 --- a/test/integration/targets/podman_image/aliases +++ b/test/integration/targets/podman_image/aliases @@ -1,4 +1,4 @@ -unsupported +shippable/posix/group3 skip/osx skip/freebsd destructive diff --git a/test/integration/targets/setup_podman/tasks/main.yml b/test/integration/targets/setup_podman/tasks/main.yml index 340b8a508084cc..3b027dba3942df 100644 --- a/test/integration/targets/setup_podman/tasks/main.yml +++ b/test/integration/targets/setup_podman/tasks/main.yml @@ -1,10 +1,13 @@ - block: + - name: Include distribution specific variables + include_vars: "{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_major_version }}.yml" + - name: Enable extras repo command: "{{ repo_command[ansible_facts.distribution ~ ansible_facts.distribution_major_version] | default('echo') }}" - name: Install podman yum: - name: podman + name: "{{ podman_package }}" state: present when: ansible_facts.pkg_mgr in ['yum', 'dnf'] when: diff --git a/test/integration/targets/setup_podman/vars/RedHat-7.yml b/test/integration/targets/setup_podman/vars/RedHat-7.yml new file mode 100644 index 00000000000000..604a139979af33 --- /dev/null +++ b/test/integration/targets/setup_podman/vars/RedHat-7.yml @@ -0,0 +1 @@ +podman_package: podman-1.3.* diff --git a/test/integration/targets/setup_podman/vars/RedHat-8.yml b/test/integration/targets/setup_podman/vars/RedHat-8.yml new file mode 100644 index 00000000000000..e21bfcb370eddc --- /dev/null +++ b/test/integration/targets/setup_podman/vars/RedHat-8.yml @@ -0,0 +1 @@ +podman_package: '@container-tools:1.0' diff --git a/test/integration/targets/setup_podman/vars/main.yml b/test/integration/targets/setup_podman/vars/main.yml index 58e3a2ab7dc6d1..b42f8e0ad90322 100644 --- a/test/integration/targets/setup_podman/vars/main.yml +++ b/test/integration/targets/setup_podman/vars/main.yml @@ -1,3 +1,2 @@ repo_command: RedHat7: yum-config-manager --enable rhui-REGION-rhel-server-extras - # RedHat8: dnf config-manager --enablerepo rhui-REGION-rhel-server-extras