diff --git a/action.yml b/action.yml index 91e8ad9..0922788 100644 --- a/action.yml +++ b/action.yml @@ -7,4 +7,4 @@ inputs: type: string runs: using: "docker" - image: "docker://ghcr.io/splunk/addonfactory-test-matrix-action/addonfactory-test-matrix-action:v3.1.3" + image: "Dockerfile" diff --git a/addonfactory_test_matrix_action/main.py b/addonfactory_test_matrix_action/main.py index 3a9735a..1f139a4 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 @@ -132,9 +133,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"]: @@ -143,6 +141,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 5191150..7008a30 100644 --- a/config/splunk_matrix.conf +++ b/config/splunk_matrix.conf @@ -1,6 +1,7 @@ [GENERAL] LATEST = 10.0 OLDEST = 9.2 +EP_SUPPORTING = 10.0 [10.0] VERSION = 10.0.2