From 3452334a7e58520980e7593bcc49b5bac4d25459 Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk <105011638+mkolasinski-splunk@users.noreply.github.com> Date: Fri, 10 Nov 2023 09:35:48 +0100 Subject: [PATCH] feat: revert unreleased python39 splunk (#154) * Revert "chore(release): 1.11.0" This reverts commit bf355c5e7745930c3f1bb142fd0f87ad35137997. * Revert "docs: update README with versions (#153)" This reverts commit af9a068269afca634a4370a505b9976c0a6426fa. * Revert "feat: add unreleased splunk (#152)" This reverts commit eaab6dbfeeaec5f82003f229926510db7b3e15fa. --- README.md | 4 +--- action.yml | 2 +- addonfactory_test_matrix_action/main.py | 2 +- config/splunk_matrix.conf | 10 ---------- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 178c0fc..fe06fd2 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ # addonfactory-test-matrix-action -This GitHub Actions is used to prepare output variables that can be used to determine the correct flow of a CI workflow. - -The latest stable version is v1.10, please use it. Version v1.11 contains unreleased Splunk version which is not accessible by public. +This Github Actions is used to prepare output variables that can be used to determine the correct flow of a CI workflow. Using this approach an addon/connector to be tested can identify by feature flag which versions of Splunk should be tested. The tool is configured by a `.addonmatrix` file in the repo root. If no file is present all supported versions of Splunk will be tested. diff --git a/action.yml b/action.yml index 15d16be..91514a4 100644 --- a/action.yml +++ b/action.yml @@ -3,4 +3,4 @@ name: "Add on factory test matrix" description: "This tool automates the selection matrix dimensions" runs: using: "docker" - image: docker://ghcr.io/splunk/addonfactory-test-matrix-action/addonfactory-test-matrix-action:v1.11.0 + image: docker://ghcr.io/splunk/addonfactory-test-matrix-action/addonfactory-test-matrix-action:v1.10.4 diff --git a/addonfactory_test_matrix_action/main.py b/addonfactory_test_matrix_action/main.py index 285ca8f..a150921 100644 --- a/addonfactory_test_matrix_action/main.py +++ b/addonfactory_test_matrix_action/main.py @@ -34,7 +34,7 @@ def _generate_supported_splunk(args, path): config.read(splunk_matrix) supported_splunk = [] for section in config.sections(): - if re.search(r"^\d+|unreleased-.*", section): + if re.search(r"^\d+", section): props = {} supported_splunk_string = config[section]["SUPPORTED"] eol = datetime.strptime(supported_splunk_string, "%Y-%m-%d").date() diff --git a/config/splunk_matrix.conf b/config/splunk_matrix.conf index a246e00..5b268b1 100644 --- a/config/splunk_matrix.conf +++ b/config/splunk_matrix.conf @@ -2,16 +2,6 @@ LATEST = 9.1 OLDEST = 8.2 -[unreleased-python3_9-a076ce4c50aa] -VERSION = unreleased-python3_9-a076ce4c50aa -BUILD = a076ce4c50aa -SUPPORTED = 2035-07-06 -PYTHON3 = true -PYTHON2 = false -METRICS_MULTI = true -INPUT_LOOKUP = true -SWC = true - [9.1] VERSION = 9.1.1 BUILD = 64e843ea36b1