Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce NAP CI time #5999

Merged
merged 2 commits into from
Jul 10, 2024
Merged

Reduce NAP CI time #5999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bebfaef
reduce nap test times
Jul 10, 2024
6b1ab2c
Merge branch 'main' into chore/reduce-test-time
Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions .github/data/matrix-smoke-nap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
{
Expand All @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@ markers =[
"appprotect_waf_policies_allow",
"appprotect_waf_policies_block",
"appprotect_waf_policies_grpc",
"appprotect_waf_policies_vsr",
"appprotect_watch",
"appprotect_batch",
"basic_auth",
"batch_start",
"create",
"delete",
"dos",
"dos_ingress",
"dos_learning",
"hsts",
"ingresses",
Expand Down
1 change: 1 addition & 0 deletions tests/suite/test_app_protect_waf_policies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
[
Expand Down
1 change: 1 addition & 0 deletions tests/suite/test_dos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ def fin():


@pytest.mark.dos
@pytest.mark.dos_ingress
@pytest.mark.parametrize(
"crd_ingress_controller_with_dos",
[
Expand Down