ansible_test_splitter - minor changes (#115)

* update return format for ansible_test_splitter

* add extra git base branch to test against

* adding some debug

Author: abikouo

.github/actions/ansible_test_splitter/action.yml

@@ -12,10 +12,19 @@ inputs:
     description: The total number of jobs to share targets on
     required: false
     default: "3"
+  base_ref:
+    description: The git base branch to compare with.
+    required: false
 outputs:
   test_targets:
-    description: The list of targets to test
+    description: The list of targets to test as concatenate string
     value: ${{ steps.splitter.outputs.test_targets }}
+  test_targets_json:
+    description: The list of targets to test as json string
+    value: ${{ steps.splitter.outputs.test_targets_json }}
+  test_jobs:
+    description: The list of generate keys
+    value: ${{ steps.splitter.outputs.test_jobs }}
 
 runs:
   using: composite
@@ -42,5 +51,5 @@ runs:
         COLLECTIONS_TO_TEST: "${{ inputs.collections_to_test }}"
         TOTAL_JOBS: "${{ inputs.total_jobs }}"
         PULL_REQUEST_BODY: "${{ github.event.pull_request.body }}"
-        PULL_REQUEST_BASE_REF: "${{ github.event.pull_request.base.ref }}"
+        PULL_REQUEST_BASE_REF: "${{ inputs.base_ref || github.event.pull_request.base.ref }}"
       shell: bash

.github/actions/ansible_test_splitter/list_changed_common.py

@@ -2,6 +2,7 @@
 """Define collection module for list_changed_targets executable."""
 
 import ast
+import json
 import os
 import re
 import subprocess
@@ -469,7 +470,7 @@ def __init__(self, collections_items: list[Collection], number_jobs: int) -> Non
         self.total_jobs = number_jobs
         self.targets_per_slot = 10
 
-    def output(self) -> str:
+    def output(self) -> dict[str, str]:
         """Produce output for the targets to test.
 
         :returns: a string describing the output
@@ -479,7 +480,10 @@ def output(self) -> str:
             slots = [f"{col.collection_name}-{i+1}" for i in range(self.total_jobs)]
             for batch in self.build_up_batches(slots, col):
                 batches.append(batch)
-        return ";".join([f"{x}:{','.join(y)}" for x, y in batches])
+        raw_string = ";".join([f"{x}:{','.join(y)}" for x, y in batches])
+        raw_json = json.dumps({x: " ".join(y) for x, y in batches})
+        jobs = json.dumps([x for x, _ in batches])
+        return {"raw": raw_string, "raw_json": raw_json, "jobs": jobs}
 
     def build_up_batches(
         self, slots: list[str], my_collection: Collection

.github/actions/ansible_test_splitter/list_changed_targets.py

@@ -123,7 +123,7 @@ def _add_changed_target(
         print("----------- Listed Changes -----------\n", json.dumps(listed_changes, indent=2))
         return {x: make_unique(y["targets"]) for x, y in listed_changes.items()}
 
-    def run(self) -> str:
+    def run(self) -> dict[str, str]:
         """List changes and divide targets into chunk.
 
         :returns: resulting string of targets divide into chunks
@@ -156,8 +156,11 @@ def write_variable_to_github_output(name: str, value: str) -> None:
 
 def main() -> None:
     """Perform main process of the module."""
-    output = ListChangedTargets().run()
-    write_variable_to_github_output("test_targets", output)
+    result = ListChangedTargets().run()
+    print("----------- change targets result -----------\n", json.dumps(result, indent=2))
+    write_variable_to_github_output("test_targets", result.get("raw", ""))
+    write_variable_to_github_output("test_targets_json", result.get("raw_json", ""))
+    write_variable_to_github_output("test_jobs", result.get("jobs", "[]"))
 
 
 if __name__ == "__main__":