Fix podman_image integration tests

Pin podman package at a specific version
ansible · Jul 30, 2019 · 727f55c · 727f55c
1 parent 8a6c7a9
commit 727f55c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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