Add PYTEST_MARKERS env and remove TESTS_REGEX

Author: adolfo-ab

tests/Makefile

@@ -15,8 +15,8 @@ OPENSHIFT_TESTUSER_PASS=
 OPENSHIFT_TESTUSER_LOGIN_PROVIDER=
 # Setting SKIP_INSTALL will let you run the tests against an ODH instance that is already setup
 SKIP_INSTALL=
-# Setting TESTS_REGEX will allow you to change which tests are going to be run
-TESTS_REGEX=
+# Pytest markers to select the tests that will be executed
+PYTEST_MARKERS=
 # Location inside the container where CI system will retrieve files after a test run
 ARTIFACT_DIR=/tmp/artifacts
 LOCAL_ARTIFACT_DIR="${PWD}/artifacts"
@@ -37,7 +37,7 @@ run:
 	# Confirm that we have a directory for storing any screenshots from selenium tests
 	mkdir -p ${LOCAL_ARTIFACT_DIR}/screenshots
 	oc config view --flatten --minify > /tmp/tests-kubeconfig
-	${BUILD_TOOL} run -e SKIP_INSTALL=$(SKIP_INSTALL) -e TESTS_REGEX=$(TESTS_REGEX) -e SKIP_OPERATOR_INSTALL=$(SKIP_OPERATOR_INSTALL) \
+	${BUILD_TOOL} run -e SKIP_INSTALL=$(SKIP_INSTALL) -e PYTEST_MARKERS=$(PYTEST_MARKERS) -e SKIP_OPERATOR_INSTALL=$(SKIP_OPERATOR_INSTALL) \
 	    -e SKIP_KFDEF_INSTALL=$(SKIP_KFDEF_INSTALL) -e ODHPROJECT=$(ODHPROJECT) \
 		-e OPENSHIFT_TESTUSER_NAME="$(OPENSHIFT_TESTUSER_NAME)" -e OPENSHIFT_TESTUSER_PASS="$(OPENSHIFT_TESTUSER_PASS)" -e OPENSHIFT_TESTUSER_LOGIN_PROVIDER=$(OPENSHIFT_TESTUSER_LOGIN_PROVIDER) -e ARTIFACT_DIR=$(ARTIFACT_DIR) \
 		-e LOCAL=$(LOCAL) -e TEARDOWN=$(TEARDOWN)\

tests/README.md

@@ -24,7 +24,7 @@ make clean # remove the artifacts of the test from the cluster (operator, ODH, p
 * `BUILD_TOOL=docker/podman`: set the tool used to build and run the testing container
 * `SKIP_INSTALL=true/false`: skip the install of the ODH operator, if you've already installed it manually or via a previous test
 * `SKIP_KFDEF_INSTALL=true/false`: skip the install of ODH via KFdef, if you've already installed it manually or via a previous test
-* `TESTS_REGEX=${REGEX}`: only run tests whose names match the regex
+* `PYTEST_MARKERS`: Used to select the tests that will be executed. [Available markers](https://github.com/trustyai-explainability/trustyai-tests/blob/main/pyproject.toml).
 * `LOCAL=true/false`: This flag makes the test suite stop and wait for user input between the end of a test script and cluster teardown.   This prevents automatic teardown, which is useful for manual inspection of the cluster before teardown when running the tests locally.
 * `TEARDOWN=true/false`: This flag will just run the corresponding `teardown` functions within the various tests, useful for cleaning up stranded components from failed tests, without deleting the operator and ODH install. It's recommended to use this with a `make run`, as using `make test` will trigger a `make clean` that fully wipes the cluster. 
 
@@ -47,10 +47,6 @@ If you'd like to run the tests against an instance that already has a KfDef crea
 you set `SKIP_KFDEF_INSTALL=true` and that will cause the test run
 to skip the step of creating the default KfDef.  example: `make run SKIP_KFDEF_INSTALL=true`
 
-If you'd like to run a single test instead of all tests, you can
-set the TESTS_REGEX variable `TESTS_REGEX=<name of the test to run>`.  That will
-only run the test that you specify instead of all of the tests.  example: `make run TESTS_REGEX=grafana`
-
 If you have a local instance already running the operator and you'd like to skip that part
 of the install process, you can set `SKIP_OPERATOR_INSTALL=true` and that will bypass installation
 of the operator, but will still install the authentication for any user tests.