ci: fix ci tests

fix ci tests

Signed-off-by: Rich Megginson <[email protected]>

pytest_extra_requirements.txt

@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+
+# ansible and dependencies for all supported platforms
+ansible ; python_version > "2.6"
+ansible<2.7 ; python_version < "2.7"
+idna<2.8 ; python_version < "2.7"
+PyYAML<5.1 ; python_version < "2.7"

tasks/enable-repositories/CentOS.yml

@@ -1,4 +1,13 @@
 # SPDX-License-Identifier: MIT
-# No enable-repositories tasks are needed for Fedora. This file serves as a
-# placeholder and prevents RedHat.yml to be executed instead.
 ---
+- name: List active CentOS repositories
+  command: dnf repolist
+  register: __gfs2_repolist
+  changed_when: false
+  check_mode: false
+
+- name: Enable CentOS repositories
+  command: dnf config-manager --set-enabled {{ item.id | quote }}
+  loop: "{{ __gfs2_repos }}"
+  when: item.id not in __gfs2_repolist.stdout
+  changed_when: item.name not in __gfs2_repolist.stdout

tasks/install-packages.yml

@@ -1,27 +1,9 @@
 # SPDX-License-Identifier: MIT
 ---
-- name: Ensure ansible_facts used by role
-  setup:
-    gather_subset: "{{ __gfs2_required_facts_subsets }}"
-  when: __gfs2_required_facts |
-    difference(ansible_facts.keys() | list) | length > 0
-
-- name: Determine if system is ostree and set flag
-  when: not __gfs2_is_ostree is defined
-  block:
-    - name: Check if system is ostree
-      stat:
-        path: /run/ostree-booted
-      register: __ostree_booted_stat
-
-    - name: Set flag to indicate system is ostree
-      set_fact:
-        __gfs2_is_ostree: "{{ __ostree_booted_stat.stat.exists }}"
-
 - name: Find environment-specific tasks to enable repositories
   ansible.builtin.set_fact:
-    __gfs2_enable_repo_tasks_file: \
-      "{{ __gfs2_enable_repo_tasks_file_candidate }}"
+    __gfs2_enable_repo_tasks_file: >-
+      {{ __gfs2_enable_repo_tasks_file_candidate }}
   loop:
     - "{{ ansible_facts['os_family'] }}.yml"
     - "{{ ansible_facts['distribution'] }}.yml"
@@ -32,8 +14,8 @@
       {{ ansible_facts['distribution'] ~ '_' ~
       ansible_facts['distribution_version'] }}.yml
   vars:
-    __gfs2_enable_repo_tasks_file_candidate: \
-      "{{ role_path }}/tasks/enable-repositories/{{ item }}"
+    __gfs2_enable_repo_tasks_file_candidate: >-
+      {{ role_path }}/tasks/enable-repositories/{{ item }}
   when:
     - gfs2_enable_repos | bool
     - __gfs2_enable_repo_tasks_file_candidate is file

tasks/main.yml

@@ -1,5 +1,11 @@
 # SPDX-License-Identifier: MIT
 ---
+- name: Set platform/version specific variables
+  ansible.builtin.include_tasks: set_vars.yml
+
+- name: Install required packages
+  ansible.builtin.include_tasks: install-packages.yml
+
 - name: Check for an active stonith resource
   ansible.builtin.command:
     argv:
@@ -14,9 +20,6 @@
       or "Started" not in stonith_status.stdout
   when: not _gfs2_test_allow_stonith_disabled
 
-- name: Install required packages
-  ansible.builtin.include_tasks: install-packages.yml
-
 - name: Setup cluster
   ansible.builtin.include_tasks: setup-cluster.yml
   when: gfs2_file_systems | length > 0

tasks/set_vars.yml

@@ -0,0 +1,33 @@
+---
+- name: Ensure ansible_facts used by role
+  ansible.builtin.setup:
+    gather_subset: "{{ __gfs2_required_facts_subsets }}"
+  when: __gfs2_required_facts |
+    difference(ansible_facts.keys() | list) | length > 0
+
+- name: Determine if system is ostree and set flag
+  when: not __gfs2_is_ostree is defined
+  block:
+    - name: Check if system is ostree
+      ansible.builtin.stat:
+        path: /run/ostree-booted
+      register: __ostree_booted_stat
+
+    - name: Set flag to indicate system is ostree
+      ansible.builtin.set_fact:
+        __gfs2_is_ostree: "{{ __ostree_booted_stat.stat.exists }}"
+
+- name: Set platform/version specific variables
+  ansible.builtin.include_vars: "{{ __vars_file }}"
+  loop:
+    - "{{ ansible_facts['os_family'] }}.yml"
+    - "{{ ansible_facts['distribution'] }}.yml"
+    - >-
+      {{ ansible_facts['distribution'] ~ '_' ~
+      ansible_facts['distribution_major_version'] }}.yml
+    - >-
+      {{ ansible_facts['distribution'] ~ '_' ~
+      ansible_facts['distribution_version'] }}.yml
+  vars:
+    __vars_file: "{{ role_path }}/vars/{{ item }}"
+  when: __vars_file is file

tests/library/find_unused_disk.py

@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
 from __future__ import absolute_import, division, print_function
 
 __metaclass__ = type

tests/module_utils/size.py

@@ -161,6 +161,7 @@ def get(self, units="autobin", fmt="%0.1f %sb"):
                 exp += 1
         else:
             ftr, exp = self._parse_units(units.strip())
-            value = (float(self.factor**self.exponent) / float(ftr**exp)) * self.number
-
+            value = (
+                float(self.factor**self.exponent) / float(ftr**exp)
+            ) * self.number
         return self._format(fmt, ftr, exp) % value

vars/CentOS_8.yml

@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: MIT
+---
+__gfs2_repos:
+  - id: resilientstorage
+    name: ResilientStorage

vars/CentOS_9.yml

@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: MIT
+---
+__gfs2_repos:
+  - id: resilientstorage
+    name: ResilientStorage