diff --git a/action.yml b/action.yml index 3cffbb6..bdff5ce 100644 --- a/action.yml +++ b/action.yml @@ -2,4 +2,4 @@ name: "addonfactory-test-matrix-action" description: "This tool automates the selection matrix dimensions" runs: using: "docker" - image: "docker://ghcr.io/splunk/addonfactory-test-matrix-action/addonfactory-test-matrix-action:v3.0.0" + image: "Dockerfile" diff --git a/addonfactory_test_matrix_action/main.py b/addonfactory_test_matrix_action/main.py index 430cf91..901ad2d 100644 --- a/addonfactory_test_matrix_action/main.py +++ b/addonfactory_test_matrix_action/main.py @@ -50,6 +50,7 @@ def _generate_supported_splunk(args, path): "build": props["build"], "islatest": (config["GENERAL"]["LATEST"] == section), "isoldest": (config["GENERAL"]["OLDEST"] == section), + "isEpSupporting": (config["GENERAL"]["EP_SUPPORTING"] == section), } ) return supported_splunk @@ -143,9 +144,6 @@ def main(): path = os.path.join(Path(__file__).parent.parent, "config") supported_splunk = _generate_supported_splunk(args, path) - pprint.pprint(f"Supported Splunk versions: {json.dumps(supported_splunk)}") - with open(os.environ["GITHUB_OUTPUT"], "a") as fh: - print(f"supportedSplunk={json.dumps(supported_splunk)}", file=fh) for splunk in supported_splunk: if splunk["islatest"]: @@ -154,6 +152,17 @@ def main(): print(f"latestSplunk={json.dumps([splunk])}", file=fh) break + splunk_supporting_ep = next((splunk for splunk in supported_splunk if splunk["isEpSupporting"]), None) + if splunk_supporting_ep: + pprint.pprint(f"EP Supporting Splunk version: {json.dumps(splunk_supporting_ep)}") + supported_splunk.remove(splunk_supporting_ep) # do not pass this splunk version on the supported list + with open(os.environ["GITHUB_OUTPUT"], "a") as fh: + print(f"epSupportingSplunk={json.dumps(splunk_supporting_ep)}", file=fh) + + pprint.pprint(f"Supported Splunk versions: {json.dumps(supported_splunk)}") + with open(os.environ["GITHUB_OUTPUT"], "a") as fh: + print(f"supportedSplunk={json.dumps(supported_splunk)}", file=fh) + supported_sc4s = _generate_supported_sc4s(args, path) pprint.pprint(f"Supported SC4S versions: {json.dumps(supported_sc4s)}") with open(os.environ["GITHUB_OUTPUT"], "a") as fh: diff --git a/config/splunk_matrix.conf b/config/splunk_matrix.conf index 63b68d7..a3dc999 100644 --- a/config/splunk_matrix.conf +++ b/config/splunk_matrix.conf @@ -1,10 +1,22 @@ [GENERAL] LATEST = 9.4 OLDEST = 9.1 +EP_SUPPORTING = 10.0 + +[10.0] +VERSION = 6016cc9bfec2 +BUILD = 6016cc9bfec2 +SUPPORTED = 2026-12-16 +PYTHON3 = true +PYTHON2 = false +SWC = true +METRICS_MULTI = true +INPUT_LOOKUP = true + [9.4] -VERSION = 9.4.0 -BUILD = 6b4ebe426ca6 +VERSION = 9.4.1 +BUILD = e3bdab203ac8 SUPPORTED = 2026-12-16 PYTHON3 = true PYTHON2 = false @@ -13,8 +25,8 @@ METRICS_MULTI = true INPUT_LOOKUP = true [9.3] -VERSION = 9.3.2 -BUILD = d8bb32809498 +VERSION = 9.3.3 +BUILD = 75595d8f83ef SUPPORTED = 2026-07-24 PYTHON3 = true PYTHON2 = false @@ -23,8 +35,8 @@ METRICS_MULTI = true INPUT_LOOKUP = true [9.2] -VERSION = 9.2.4 -BUILD = c103a21bb11d +VERSION = 9.2.5 +BUILD = 7bfc9a4ed6ba SUPPORTED = 2026-01-31 PYTHON3 = true PYTHON2 = false @@ -33,8 +45,8 @@ METRICS_MULTI = true INPUT_LOOKUP = true [9.1] -VERSION = 9.1.7 -BUILD = e17104057ef0 +VERSION = 9.1.8 +BUILD = d45427bb0c27 SUPPORTED = 2025-06-28 PYTHON3 = true PYTHON2 = false