split ingress plus tests

Author: pdabelf5

.github/data/matrix-smoke-plus.json

@@ -29,14 +29,21 @@
       "platforms": "linux/arm64, linux/amd64"
     },
     {
-      "label": "ingresses 1/2",
+      "label": "ingresses 1/3",
       "image": "alpine-plus",
       "type": "plus",
-      "marker": "'ingresses and not annotations and not basic_auth and not hsts and not watch_namespace and not wildcard_tls'",
+      "marker": "'ingresses and not annotations and not basic_auth and not hsts and not watch_namespace and not wildcard_tls and not ingresses_smoke and not ingresses_jwt'",
       "platforms": "linux/arm64, linux/amd64"
     },
     {
-      "label": "ingresses 2/2",
+      "label": "ingresses 2/3",
+      "image": "alpine-plus",
+      "type": "plus",
+      "marker": "'ingresses_smoke or ingresses_jwt'",
+      "platforms": "linux/arm64, linux/amd64"
+    },
+    {
+      "label": "ingresses 3/3",
       "image": "alpine-plus-fips",
       "type": "plus",
       "marker": "'annotations or basic_auth or hsts or watch_namespace or wildcard_tls'",
@@ -81,7 +88,7 @@
       "label": "policies 3/5",
       "image": "ubi-9-plus",
       "type": "plus",
-      "marker": "'policies_jwt or or otel'",
+      "marker": "'policies_jwt or otel'",
       "platforms": "linux/arm64, linux/amd64"
     },
     {

pyproject.toml

@@ -45,6 +45,8 @@ markers = [
     "dos_learning",
     "hsts",
     "ingresses",
+    "ingresses_jwt",
+    "ingresses_smoke",
     "multi_ns",
     "oidc",
     "otel",

tests/suite/test_jwt_auth_mergeable.py

@@ -195,6 +195,7 @@ def get_token_from_file(token_type) -> str:
 
 
 @pytest.mark.ingresses
+@pytest.mark.ingresses_jwt
 @pytest.mark.skip_for_nginx_oss
 class TestJWTAuthMergeableMinions:
     def test_jwt_auth_response_codes_and_location(self, kube_apis, jwt_auth_setup, test_namespace):

tests/suite/test_jwt_secrets.py

@@ -93,6 +93,7 @@ def fin():
 
 
 @pytest.mark.ingresses
+@pytest.mark.ingresses_jwt
 @pytest.mark.skip_for_nginx_oss
 class TestJWTSecrets:
     def test_response_code_200_and_server_name(self, jwt_secrets_setup, jwt_secret):

tests/suite/test_smoke.py

@@ -73,6 +73,7 @@ def fin():
 
 @pytest.mark.smoke
 @pytest.mark.ingresses
+@pytest.mark.ingresses_smoke
 class TestSmoke:
     @pytest.mark.parametrize(
         "ingress_controller",