Re-enable snap tests (#3967) (#3982)

* Re-enable snap tests.

* Skip tests on RHEL 8.2 and 8.3.

* Refactor snap setup.

* Try to simplify setup.

(cherry picked from commit bb78d98f8f)

tests/integration/targets/setup_snap/meta/main.yml

@@ -0,0 +1,3 @@
+dependencies:
+  - setup_pkg_mgr
+  - setup_epel

tests/integration/targets/setup_snap/tasks/D-RedHat-8.2.yml

@@ -0,0 +1 @@
+nothing.yml

tests/integration/targets/setup_snap/tasks/D-RedHat-8.3.yml

@@ -0,0 +1 @@
+nothing.yml

tests/integration/targets/setup_snap/tasks/main.yml

@@ -0,0 +1,23 @@
+---
+####################################################################
+# WARNING: These are designed specifically for Ansible tests       #
+# and should not be used as examples of how to write Ansible roles #
+####################################################################
+
+- name: Print information on which we distinguish
+  debug:
+    msg: "Distribution '{{ ansible_facts.distribution }}', version '{{ ansible_facts.distribution_version }}', OS family '{{ ansible_facts.os_family }}'"
+
+- name: Include distribution specific tasks
+  include_tasks: "{{ lookup('first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "D-{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_version }}.yml"
+        - "D-{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_major_version }}.yml"
+        - "{{ ansible_facts.os_family }}-{{ ansible_facts.distribution_major_version }}.yml"
+        - "D-{{ ansible_facts.distribution }}.yml"
+        - "{{ ansible_facts.os_family }}.yml"
+        - "nothing.yml"
+      paths:
+        - "{{ role_path }}/tasks"

tests/integration/targets/snap/aliases

@@ -4,4 +4,3 @@ skip/freebsd
 skip/osx
 skip/macos
 skip/docker
-disabled  # FIXME

tests/integration/targets/snap/meta/main.yml

@@ -1,3 +1,2 @@
 dependencies:
-  - setup_pkg_mgr
-  - setup_epel
+  - setup_snap

tests/integration/targets/snap/tasks/main.yml

@@ -4,19 +4,6 @@
 # and should not be used as examples of how to write Ansible roles #
 ####################################################################
 
-- name: Include distribution specific tasks
-  include_tasks: "{{ lookup('first_found', params) }}"
-  vars:
-    params:
-      files:
-        - "{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_major_version }}.yml"
-        - "{{ ansible_facts.os_family }}-{{ ansible_facts.distribution_major_version }}.yml"
-        - "{{ ansible_facts.distribution }}.yml"
-        - "{{ ansible_facts.os_family }}.yml"
-        - "nothing.yml"
-      paths:
-        - "{{ role_path }}/tasks"
-
 - block:
     - name: Make sure package is not installed
       community.general.snap: