Merge pull request #1148 from rjeffman/fix_checkpr_test_selection

upstream CI: Fix test selection for CheckPR pipeline.

tests/azure/templates/fast_tests.yml

@@ -13,30 +13,12 @@ jobs:
 - template: playbook_fast.yml
   parameters:
     group_number: 1
-    number_of_groups: 3
+    number_of_groups: 1
     build_number: ${{ parameters.build_number }}
     scenario: ${{ parameters.scenario }}
     ansible_version: ${{ parameters.ansible_version }}
     python_version: '< 3.12'
 
-- template: playbook_fast.yml
-  parameters:
-    group_number: 2
-    number_of_groups: 3
-    build_number: ${{ parameters.build_number }}
-    scenario: ${{ parameters.scenario }}
-    ansible_version: ${{ parameters.ansible_version }}
-    python_version: '< 3.12'
-
-- template: playbook_fast.yml
-  parameters:
-    group_number: 3
-    number_of_groups: 3
-    build_number: ${{ parameters.build_number }}
-    scenario: ${{ parameters.scenario }}
-    ansible_version: ${{ parameters.ansible_version }}z
-    python_version: '< 3.12'
-
 # - template: pytest_tests.yml
 #   parameters:
 #     build_number: ${{ parameters.build_number }}

tests/azure/templates/galaxy_script.yml

@@ -67,6 +67,7 @@ jobs:
         --color=yes \
         --splits=${{ parameters.number_of_groups }} \
         --group=${{ parameters.group_number }} \
+        --randomly-seed=$(date "+%Y%m%d") \
         --junit-xml=TEST-results-group-${{ parameters.group_number }}.xml
     displayName: Run playbook tests
     env:

tests/azure/templates/playbook_fast.yml

@@ -72,6 +72,7 @@ jobs:
         --suppress-no-test-exit-code \
         --splits=${{ parameters.number_of_groups }} \
         --group=${{ parameters.group_number }} \
+        --randomly-seed=$(date "+%Y%m%d") \
         --junit-xml=TEST-results-group-${{ parameters.group_number }}.xml
       then
         [ $? -eq 5 ] && true || false

tests/azure/templates/playbook_tests.yml

@@ -69,6 +69,7 @@ jobs:
         --color=yes \
         --splits=${{ parameters.number_of_groups }} \
         --group=${{ parameters.group_number }} \
+        --randomly-seed=$(date "+%Y%m%d") \
         --junit-xml=TEST-results-group-${{ parameters.group_number }}.xml
     displayName: Run playbook tests
     env:

utils/get_test_modules.py

@@ -23,8 +23,6 @@ def get_plugins_from_playbook(playbook):
         for tasks in task_block:
             for task in tasks:
                 original_task = task
-                if "." in task:
-                    task = task.split(".")[-1]
                 if task == "block":
                     _result.update(get_tasks(tasks["block"]))
                 elif task in ["include_tasks", "import_tasks"
@@ -127,8 +125,16 @@ def parse_playbooks(test_module):
                             "builtins.__import__", side_effect=import_mock
                         ):
                             # pylint: disable=no-value-for-parameter
-                            loader = SourceFileLoader(playbook, source)
-                            loader.exec_module(types.ModuleType(loader.name))
+                            try:
+                                loader = SourceFileLoader(playbook, source)
+                                loader.exec_module(
+                                    types.ModuleType(loader.name)
+                                )
+                            except Exception:  # pylint: disable=broad-except
+                                # If import fails, we'll assume there's no
+                                # plugin to be loaded. This is of little risk
+                                # it is rare that a plugin includes another.
+                                pass
                         # pylint: disable=no-member
                         candidates = [
                             f.split(".")[1:]