From ce59df01e38e50e8b65b8e096c6c6b0e6e2f5f46 Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Tue, 30 Jul 2019 15:11:35 -0400 Subject: [PATCH] [stable-2.8] Fix podman_image integration tests (#59805) Pin podman package at a specific version (cherry picked from commit 691976c3d0) Co-authored-by: Sam Doran --- test/integration/targets/setup_podman/tasks/main.yml | 5 ++++- test/integration/targets/setup_podman/vars/RedHat-7.yml | 1 + test/integration/targets/setup_podman/vars/RedHat-8.yml | 1 + test/integration/targets/setup_podman/vars/main.yml | 1 - 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 test/integration/targets/setup_podman/vars/RedHat-7.yml create mode 100644 test/integration/targets/setup_podman/vars/RedHat-8.yml diff --git a/test/integration/targets/setup_podman/tasks/main.yml b/test/integration/targets/setup_podman/tasks/main.yml index 340b8a50808..3b027dba394 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 00000000000..604a139979a --- /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 00000000000..e21bfcb370e --- /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 58e3a2ab7dc..b42f8e0ad90 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