separate Policies test jobs

.github/workflows/ci.yml

@@ -256,7 +256,8 @@ jobs:
  echo "matrix={\"images\": \
  [{\"image\": \"debian\", \"marker\": \"ingresses\"}, \
  {\"image\": \"alpine\", \"marker\":\"vsr\"}, \
- {\"image\": \"alpine\", \"marker\":\"policies\"}, \
+ {\"image\": \"alpine\", \"marker\":\"'policies and not policies_rl and not policies_ac and not policies_jwt and not policies_mtls'\"}, \
+ {\"image\": \"alpine\", \"marker\":\"'policies or policies_rl or policies_ac or policies_jwt or policies_mtls'\"}, \
  {\"image\": \"debian\", \"marker\": \"'vs and not vs_ipv6 and not vs_rewrite and not vs_responses and not vs_grpc and not vs_redirects and not vs_externalname and not vs_externaldns and not vs_certmanager'\"}, \
  {\"image\": \"debian\", \"marker\": \"'vs_ipv6 or vs_rewrite or vs_responses or vs_grpc or vs_redirects or vs_externalname or vs_externaldns'\"}, \
  {\"image\": \"debian\", \"marker\": \"'vs_certmanager'\"}, \
@@ -267,7 +268,9 @@ jobs:
  {\"image\": \"debian-plus\", \"marker\": \"ts\"}, \
  {\"image\": \"alpine-plus\", \"marker\":\"ingresses\"}, \
  {\"image\": \"alpine-plus\", \"marker\": \"vsr\"}, \
- {\"image\": \"ubi-plus\", \"marker\": \"policies\"}, \
+ {\"image\": \"ubi-plus\", \"marker\":\"'policies and not policies_rl and not policies_ac and not policies_jwt and not policies_mtls'\"}, \
+ {\"image\": \"ubi-plus\", \"marker\":\"'policies or policies_rl or policies_ac or policies_jwt or policies_mtls'\"}, \
+ {\"image\": \"debian-plus-nap\", \"marker\": \"appprotect_integration\"}, \
  {\"image\": \"debian-plus-nap\", \"marker\": \"appprotect_waf_policies_allow\"}, \
  {\"image\": \"debian-plus-nap\", \"marker\": \"'appprotect_waf_policies and not appprotect_waf_policies_allow'\"}, \
  {\"image\": \"debian-plus-nap\", \"marker\": \"appprotect_waf_policies_grpc\"}, \
@@ -330,7 +333,7 @@ jobs:
  name: Build Docker OSS
  needs: smoke-tests
  strategy:
- fail-fast: false
+ fail-fast: true
  matrix:
  image: [debian, alpine]
  platforms:
@@ -354,7 +357,7 @@ jobs:
  name: Build Docker Plus
  needs: [binaries, build-docker]
  strategy:
- fail-fast: false
+ fail-fast: true
  matrix:
  image: [debian-plus, alpine-plus, alpine-plus-fips]
  platforms: ["linux/arm64, linux/amd64"]
@@ -379,7 +382,7 @@ jobs:
  name: Build Docker NAP
  needs: [binaries, build-docker-plus]
  strategy:
- fail-fast: false
+ fail-fast: true
  matrix:
  image: [debian-plus-nap, ubi-plus-nap]
  platforms: ["linux/amd64"]

pyproject.toml

@@ -35,6 +35,10 @@ markers =[
  "dos_learning",
  "ingresses",
  "policies",
+ "policies_rl",
+ "policies_jwt",
+ "policies_ac",
+ "policies_mtls",
  "rewrite",
  "skip_for_nginx_oss",
  "smoke",

tests/suite/test_ac_policies.py

@@ -66,6 +66,7 @@ def fin():
 
 
 @pytest.mark.policies
+@pytest.mark.policies_ac
 @pytest.mark.parametrize(
  "crd_ingress_controller, virtual_server_setup",
  [

tests/suite/test_ac_policies_vsr.py

@@ -50,6 +50,7 @@ def fin():
 
 
 @pytest.mark.policies
+@pytest.mark.policies_ac
 @pytest.mark.parametrize(
  "crd_ingress_controller, v_s_route_setup",
  [

tests/suite/test_egress_mtls.py

@@ -50,6 +50,7 @@ def teardown_policy(kube_apis, test_namespace, tls_secret, pol_name, mtls_secret
 
 
 @pytest.mark.policies
+@pytest.mark.policies_mtls
 @pytest.mark.parametrize(
  "crd_ingress_controller, virtual_server_setup",
  [

tests/suite/test_ingress_mtls.py

@@ -63,6 +63,7 @@ def teardown_policy(kube_apis, test_namespace, tls_secret, pol_name, mtls_secret
 
 
 @pytest.mark.policies
+@pytest.mark.policies_mtls
 @pytest.mark.parametrize(
  "crd_ingress_controller, virtual_server_setup",
  [
@@ -417,6 +418,7 @@ def test_ingress_mtls_policy_cert_crl(
 
 
 @pytest.mark.policies
+@pytest.mark.policies_mtls
 @pytest.mark.parametrize(
  "crd_ingress_controller, v_s_route_setup",
  [

tests/suite/test_jwt_policies.py

@@ -27,6 +27,7 @@
 
 @pytest.mark.skip_for_nginx_oss
 @pytest.mark.policies
+@pytest.mark.policies_jwt
 @pytest.mark.parametrize(
  "crd_ingress_controller, virtual_server_setup",
  [

tests/suite/test_jwt_policies_vsr.py

@@ -27,6 +27,7 @@
 
 @pytest.mark.skip_for_nginx_oss
 @pytest.mark.policies
+@pytest.mark.policies_jwt
 @pytest.mark.parametrize(
  "crd_ingress_controller, v_s_route_setup",
  [

tests/suite/test_rl_policies.py

@@ -25,6 +25,7 @@
 
 
 @pytest.mark.policies
+@pytest.mark.policies_rl
 @pytest.mark.parametrize(
  "crd_ingress_controller, virtual_server_setup",
  [

tests/suite/test_rl_policies_vsr.py

@@ -21,6 +21,7 @@
 
 
 @pytest.mark.policies
+@pytest.mark.policies_rl
 @pytest.mark.parametrize(
  "crd_ingress_controller, v_s_route_setup",
  [