[patch] Mark and temp disable tests that need OCP

durera · durera · commit 3692862d00bf · 2026-05-21T01:44:52.000+01:00
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -46,7 +46,7 @@ jobs:
           cat ${GITHUB_WORKSPACE}/src/mas/devops/__init__.py
           python -m pip install --upgrade pip
           pip install .[dev]
-          python -m pytest
+          python -m pytest -m "not openshift"
 
       - name: Lint with flake8
         run: |
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2026-05-21T00:23:08Z",
+  "generated_at": "2026-05-21T00:44:44Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -178,15 +178,15 @@
         "hashed_secret": "94f5ed592906089c107208b29e178ddf1f9f5143",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 35,
+        "line_number": 38,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "a9410d9785f49750b9f8672794fc288558c1611c",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 48,
+        "line_number": 51,
         "type": "Secret Keyword",
         "verified_result": null
       }
diff --git a/pyproject.toml b/pyproject.toml
@@ -3,3 +3,8 @@ requires = [
   "setuptools"
 ]
 build-backend = "setuptools.build_meta"
+
+[tool.pytest.ini_options]
+markers = [
+    "openshift: marks tests as requiring an OpenShift cluster (deselect with '-m \"not openshift\"')",
+]
diff --git a/test/src/test_mas.py b/test/src/test_mas.py
@@ -8,13 +8,16 @@
 #
 # *****************************************************************************
 
+import pytest
 from openshift import dynamic
 from kubernetes import config
 from kubernetes.client import api_client
 from kubernetes.dynamic.resource import ResourceInstance
 
 from mas.devops import mas
 
+pytestmark = pytest.mark.openshift
+
 dynClient = dynamic.DynamicClient(
     api_client.ApiClient(configuration=config.load_kube_config())
 )
diff --git a/test/src/test_olm.py b/test/src/test_olm.py
@@ -8,12 +8,15 @@
 #
 # *****************************************************************************
 
+import pytest
 from openshift import dynamic
 from kubernetes import config
 from kubernetes.client import api_client
 
 from mas.devops import olm, ocp
 
+pytestmark = pytest.mark.openshift
+
 dynClient = dynamic.DynamicClient(
     api_client.ApiClient(configuration=config.load_kube_config())
 )

Original file line number	Diff line number	Diff line change
`@@ -3,3 +3,8 @@ requires = [`
`3`	`3`	`"setuptools"`
`4`	`4`	`]`
`5`	`5`	`build-backend = "setuptools.build_meta"`
	`6`	`+`
	`7`	`+[tool.pytest.ini_options]`
	`8`	`+markers = [`
	`9`	`+ "openshift: marks tests as requiring an OpenShift cluster (deselect with '-m \"not openshift\"')",`
	`10`	`+]`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,16 @@`
`8`	`8`	`#`
`9`	`9`	`# *****************************************************************************`
`10`	`10`
	`11`	`+import pytest`
`11`	`12`	`from openshift import dynamic`
`12`	`13`	`from kubernetes import config`
`13`	`14`	`from kubernetes.client import api_client`
`14`	`15`	`from kubernetes.dynamic.resource import ResourceInstance`
`15`	`16`
`16`	`17`	`from mas.devops import mas`
`17`	`18`
	`19`	`+pytestmark = pytest.mark.openshift`
	`20`	`+`
`18`	`21`	`dynClient = dynamic.DynamicClient(`
`19`	`22`	`api_client.ApiClient(configuration=config.load_kube_config())`
`20`	`23`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,15 @@`
`8`	`8`	`#`
`9`	`9`	`# *****************************************************************************`
`10`	`10`
	`11`	`+import pytest`
`11`	`12`	`from openshift import dynamic`
`12`	`13`	`from kubernetes import config`
`13`	`14`	`from kubernetes.client import api_client`
`14`	`15`
`15`	`16`	`from mas.devops import olm, ocp`
`16`	`17`
	`18`	`+pytestmark = pytest.mark.openshift`
	`19`	`+`
`17`	`20`	`dynClient = dynamic.DynamicClient(`
`18`	`21`	`api_client.ApiClient(configuration=config.load_kube_config())`
`19`	`22`	`)`