From bebfaef12ebaa7a5eb8a0d0a98af2eb4ac4112f6 Mon Sep 17 00:00:00 2001
From: Jim Ryan <j.ryan@f5.com>
Date: Wed, 10 Jul 2024 13:35:44 +0100
Subject: [PATCH] reduce nap test times

---
 .github/data/matrix-smoke-nap.json           | 18 +++++++++++++-----
 pyproject.toml                               |  2 ++
 tests/suite/test_app_protect_waf_policies.py |  1 +
 tests/suite/test_dos.py                      |  1 +
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.github/data/matrix-smoke-nap.json b/.github/data/matrix-smoke-nap.json
index 498e97b05e..f4b2b34064 100644
--- a/.github/data/matrix-smoke-nap.json
+++ b/.github/data/matrix-smoke-nap.json
@@ -13,7 +13,7 @@
       "image": "ubi-9-plus-nap",
       "type": "plus",
       "nap_modules": "waf",
-      "marker": "'appprotect_waf_policies and not appprotect_waf_policies_allow'",
+      "marker": "'appprotect_waf_policies and not appprotect_waf_policies_allow and not appprotect_waf_policies_vsr'",
       "platforms": "linux/amd64"
     },
     {
@@ -29,19 +29,27 @@
       "image": "debian-plus-nap",
       "type": "plus",
       "nap_modules": "waf",
-      "marker": "'appprotect_watch or appprotect_batch or appprotect_integration'",
+      "marker": "'appprotect_watch or appprotect_batch or appprotect_integration or appprotect_waf_policies_vsr'",
       "platforms": "linux/amd64"
     },
     {
-      "label": "AP_DOS",
+      "label": "AP_DOS 1/3",
       "image": "debian-plus-nap",
       "type": "plus",
       "nap_modules": "dos",
-      "marker": "'dos and not dos_learning'",
+      "marker": "'dos and not dos_learning and not dos_ingress'",
       "platforms": "linux/amd64"
     },
     {
-      "label": "AP_DOS_Learning",
+      "label": "AP_DOS 2/3",
+      "image": "debian-plus-nap",
+      "type": "plus",
+      "nap_modules": "dos",
+      "marker": "'dos_ingress and not dos_learning'",
+      "platforms": "linux/amd64"
+    },
+    {
+      "label": "AP_DOS 3/3",
       "image": "ubi-8-plus-nap",
       "type": "plus",
       "nap_modules": "dos",
diff --git a/pyproject.toml b/pyproject.toml
index a47e8366ed..35c2f54aba 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,6 +30,7 @@ markers =[
     "appprotect_waf_policies_allow",
     "appprotect_waf_policies_block",
     "appprotect_waf_policies_grpc",
+    "appprotect_waf_policies_vsr",
     "appprotect_watch",
     "appprotect_batch",
     "basic_auth",
@@ -37,6 +38,7 @@ markers =[
     "create",
     "delete",
     "dos",
+    "dos_ingress",
     "dos_learning",
     "hsts",
     "ingresses",
diff --git a/tests/suite/test_app_protect_waf_policies.py b/tests/suite/test_app_protect_waf_policies.py
index a1904721ed..14bebba6cf 100644
--- a/tests/suite/test_app_protect_waf_policies.py
+++ b/tests/suite/test_app_protect_waf_policies.py
@@ -369,6 +369,7 @@ def test_ap_waf_policy_multi_logs(
 @pytest.mark.skip_for_nginx_oss
 @pytest.mark.appprotect
 @pytest.mark.appprotect_waf_policies
+@pytest.mark.appprotect_waf_policies_vsr
 @pytest.mark.parametrize(
     "crd_ingress_controller_with_ap, v_s_route_setup",
     [
diff --git a/tests/suite/test_dos.py b/tests/suite/test_dos.py
index adec26a82f..7019aebff2 100644
--- a/tests/suite/test_dos.py
+++ b/tests/suite/test_dos.py
@@ -144,6 +144,7 @@ def fin():
 
 
 @pytest.mark.dos
+@pytest.mark.dos_ingress
 @pytest.mark.parametrize(
     "crd_ingress_controller_with_dos",
     [