make agent tests run on all images

Author: pdabelf5

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

@@ -29,7 +29,7 @@
       "image": "debian-plus-nap",
       "type": "plus",
       "nap_modules": "waf",
-      "marker": "'appprotect_watch or appprotect_batch or appprotect_integration or appprotect_waf_policies_vsr'",
+      "marker": "'appprotect and not appprotect_waf_policies'",
       "platforms": "linux/amd64"
     },
     {
@@ -63,14 +63,6 @@
       "nap_modules": "dos",
       "marker": "dos_learning",
       "platforms": "linux/amd64"
-    },
-    {
-      "label": "AGENT 1/1",
-      "image": "debian-plus-nap",
-      "type": "plus",
-      "nap_modules": "waf",
-      "marker": "agent",
-      "platforms": "linux/amd64"
     }
   ],
   "k8s": []

tests/suite/test_agent_app_protect.py renamed to tests/suite/test_agent.py

@@ -4,7 +4,7 @@
 
 
 @pytest.mark.skip_for_nginx_oss
-@pytest.mark.agent
+@pytest.mark.appprotect
 @pytest.mark.parametrize(
     "crd_ingress_controller_with_ap",
     [
@@ -18,7 +18,7 @@
     ],
     indirect=["crd_ingress_controller_with_ap"],
 )
-class TestAppProtectAgent:
+class TestAppProtectAgentV2:
     def test_ap_agent(self, kube_apis, ingress_controller_prerequisites, crd_ingress_controller_with_ap):
         pod_name = get_first_pod_name(kube_apis.v1, "nginx-ingress")
         log = kube_apis.v1.read_namespaced_pod_log(pod_name, ingress_controller_prerequisites.namespace)
@@ -47,4 +47,47 @@ def test_ap_agent(self, kube_apis, ingress_controller_prerequisites, crd_ingress
         result_conf = str(resp)
 
         assert f"Failed to get nginx-agent version: fork/exec /usr/bin/nginx-agent" not in log
-        assert "nginx-agent version " in result_conf
+        assert "nginx-agent version v2" in result_conf
+
+
+@pytest.mark.parametrize(
+    "ingress_controller",
+    [
+        {
+            "extra_args": [
+                f"-agent=true",
+            ]
+        }
+    ],
+    indirect=["ingress_controller"],
+)
+class TestAgentV3:
+    def test_ap_agent(self, kube_apis, ingress_controller_prerequisites, ingress_controller):
+        pod_name = get_first_pod_name(kube_apis.v1, "nginx-ingress")
+        log = kube_apis.v1.read_namespaced_pod_log(pod_name, ingress_controller_prerequisites.namespace)
+
+        command = ["/usr/bin/nginx-agent", "-v"]
+        retries = 0
+        while retries <= 3:
+            wait_before_test()
+            try:
+                resp = stream(
+                    kube_apis.v1.connect_get_namespaced_pod_exec,
+                    pod_name,
+                    ingress_controller_prerequisites.namespace,
+                    command=command,
+                    stderr=True,
+                    stdin=False,
+                    stdout=True,
+                    tty=False,
+                )
+                break
+            except Exception as e:
+                print(f"Error: {e}")
+                retries += 1
+                if retries == 3:
+                    raise e
+        result_conf = str(resp)
+
+        assert f"Failed to get nginx-agent version: fork/exec /usr/bin/nginx-agent" not in log
+        assert "nginx-agent version v3" in result_conf