Skip to content

Commit 38e17d7

Browse files
pdabelf5pdabelf5
committed
only run my test please
1 parent fb5fd06 commit 38e17d7

File tree

5 files changed

+779
-233
lines changed

5 files changed

+779
-233
lines changed

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

Lines changed: 1 addition & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,4 @@
11
{
2-
"images": [
3-
{
4-
"label": "AP_WAF 1/4",
5-
"image": "ubi-8-plus-nap",
6-
"type": "plus",
7-
"nap_modules": "waf",
8-
"marker": "appprotect_waf_policies_allow",
9-
"platforms": "linux/amd64"
10-
},
11-
{
12-
"label": "AP_WAF 2/4",
13-
"image": "ubi-9-plus-nap",
14-
"type": "plus",
15-
"nap_modules": "waf",
16-
"marker": "'appprotect_waf_policies and not appprotect_waf_policies_allow and not appprotect_waf_policies_vsr'",
17-
"platforms": "linux/amd64"
18-
},
19-
{
20-
"label": "AP_WAF 3/4",
21-
"image": "alpine-plus-nap-fips",
22-
"type": "plus",
23-
"nap_modules": "waf",
24-
"marker": "appprotect_waf_policies_grpc",
25-
"platforms": "linux/amd64"
26-
},
27-
{
28-
"label": "AP_WAF 4/4",
29-
"image": "debian-plus-nap",
30-
"type": "plus",
31-
"nap_modules": "waf",
32-
"marker": "'appprotect_watch or appprotect_batch or appprotect_integration or appprotect_waf_policies_vsr'",
33-
"platforms": "linux/amd64"
34-
},
35-
{
36-
"label": "AP_WAF_V5 1/1",
37-
"image": "debian-plus-nap-v5",
38-
"type": "plus",
39-
"nap_modules": "waf",
40-
"marker": "appprotect_waf_v5",
41-
"platforms": "linux/amd64"
42-
},
43-
{
44-
"label": "AP_DOS 1/3",
45-
"image": "debian-plus-nap",
46-
"type": "plus",
47-
"nap_modules": "dos",
48-
"marker": "'dos and not dos_learning and not dos_ingress'",
49-
"platforms": "linux/amd64"
50-
},
51-
{
52-
"label": "AP_DOS 2/3",
53-
"image": "debian-plus-nap",
54-
"type": "plus",
55-
"nap_modules": "dos",
56-
"marker": "'dos_ingress and not dos_learning'",
57-
"platforms": "linux/amd64"
58-
},
59-
{
60-
"label": "AP_DOS 3/3",
61-
"image": "ubi-9-plus-nap",
62-
"type": "plus",
63-
"nap_modules": "dos",
64-
"marker": "dos_learning",
65-
"platforms": "linux/amd64"
66-
},
67-
{
68-
"label": "AGENT 1/1",
69-
"image": "debian-plus-nap",
70-
"type": "plus",
71-
"nap_modules": "waf",
72-
"marker": "agent",
73-
"platforms": "linux/amd64"
74-
}
75-
],
2+
"images": [],
763
"k8s": []
774
}

‎.github/data/matrix-smoke-oss.json‎

Lines changed: 1 addition & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,4 @@
11
{
2-
"images": [
3-
{
4-
"label": "ingresses 1/2",
5-
"image": "debian",
6-
"type": "oss",
7-
"marker": "'ingresses and not annotations and not basic_auth and not hsts and not watch_namespace and not wildcard_tls'",
8-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
9-
},
10-
{
11-
"label": "ingresses 2/2",
12-
"image": "debian",
13-
"type": "oss",
14-
"marker": "'annotations or basic_auth or hsts or watch_namespace or wildcard_tls'",
15-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
16-
},
17-
{
18-
"label": "VSR 1/3",
19-
"image": "alpine",
20-
"type": "oss",
21-
"marker": "'vsr and not vsr_upstream and not vsr_grpc and not vsr_status and not vsr_canary and not vsr_routing and not vsr_api and not vsr_redirects and not vsr_rewrite and not vsr_canned and not vsr_basic'",
22-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
23-
},
24-
{
25-
"label": "VSR 2/3",
26-
"image": "alpine",
27-
"type": "oss",
28-
"marker": "'vsr_basic or vsr_canned or vsr_rewrite or vsr_redirects or vsr_upstream'",
29-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
30-
},
31-
{
32-
"label": "VSR 3/3",
33-
"image": "alpine",
34-
"type": "oss",
35-
"marker": "'vsr_api or vsr_routing or vsr_canary or vsr_status or vsr_grpc'",
36-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
37-
},
38-
{
39-
"label": "policies 1/2",
40-
"image": "alpine",
41-
"type": "oss",
42-
"marker": "'policies and not policies_rl and not policies_ac and not policies_jwt and not policies_mtls'",
43-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
44-
},
45-
{
46-
"label": "policies 2/2",
47-
"image": "alpine",
48-
"type": "oss",
49-
"marker": "'policies_rl or policies_ac or policies_jwt or policies_mtls'",
50-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
51-
},
52-
{
53-
"label": "VS 1/3",
54-
"image": "debian",
55-
"type": "oss",
56-
"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 and not vs_api and not vs_backup and not vs_use_cluster_ip and not vs_canary and not vs_upstream and not vs_config_map'",
57-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
58-
},
59-
{
60-
"label": "VS 2/3",
61-
"image": "debian",
62-
"type": "oss",
63-
"marker": "'vs_grpc or vs_redirects or vs_externalname or vs_externaldns or vs_api or vs_backup or vs_use_cluster_ip or vs_canary or vs_upstream or vs_config_map'",
64-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
65-
},
66-
{
67-
"label": "VS 3/3",
68-
"image": "debian",
69-
"type": "oss",
70-
"marker": "'vs_responses or vs_ipv6 or vs_rewrite or vs_certmanager'",
71-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
72-
},
73-
{
74-
"label": "TS",
75-
"image": "ubi",
76-
"type": "oss",
77-
"marker": "ts",
78-
"platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
79-
}
80-
],
2+
"images": [],
813
"k8s": []
824
}

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

Lines changed: 1 addition & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,11 @@
11
{
22
"images": [
3-
{
4-
"label": "VS 1/3",
5-
"image": "debian-plus",
6-
"type": "plus",
7-
"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 and not vs_api and not vs_backup and not vs_use_cluster_ip and not vs_canary and not vs_upstream and not vs_config_map'",
8-
"platforms": "linux/arm64, linux/amd64"
9-
},
10-
{
11-
"label": "VS 2/3",
12-
"image": "debian-plus",
13-
"type": "plus",
14-
"marker": "'vs_grpc or vs_redirects or vs_externalname or vs_externaldns or vs_api or vs_backup or vs_use_cluster_ip or vs_canary or vs_upstream or vs_config_map'",
15-
"platforms": "linux/arm64, linux/amd64"
16-
},
17-
{
18-
"label": "VS 3/3",
19-
"image": "debian-plus",
20-
"type": "plus",
21-
"marker": "'vs_responses or vs_ipv6 or vs_rewrite or vs_certmanager'",
22-
"platforms": "linux/arm64, linux/amd64"
23-
},
24-
{
25-
"label": "TS",
26-
"image": "debian-plus",
27-
"type": "plus",
28-
"marker": "ts",
29-
"platforms": "linux/arm64, linux/amd64"
30-
},
31-
{
32-
"label": "ingresses 1/2",
33-
"image": "alpine-plus",
34-
"type": "plus",
35-
"marker": "'ingresses and not annotations and not basic_auth and not hsts and not watch_namespace and not wildcard_tls'",
36-
"platforms": "linux/arm64, linux/amd64"
37-
},
38-
{
39-
"label": "ingresses 2/2",
40-
"image": "alpine-plus-fips",
41-
"type": "plus",
42-
"marker": "'annotations or basic_auth or hsts or watch_namespace or wildcard_tls'",
43-
"platforms": "linux/arm64, linux/amd64"
44-
},
45-
{
46-
"label": "VSR 1/3",
47-
"image": "alpine-plus",
48-
"type": "plus",
49-
"marker": "'vsr and not vsr_upstream and not vsr_grpc and not vsr_status and not vsr_canary and not vsr_routing and not vsr_api and not vsr_redirects and not vsr_rewrite and not vsr_canned and not vsr_basic'",
50-
"platforms": "linux/arm64, linux/amd64"
51-
},
52-
{
53-
"label": "VSR 2/3",
54-
"image": "alpine-plus-fips",
55-
"type": "plus",
56-
"marker": "'vsr_basic or vsr_canned or vsr_rewrite or vsr_redirects or vsr_upstream'",
57-
"platforms": "linux/arm64, linux/amd64"
58-
},
59-
{
60-
"label": "VSR 3/3",
61-
"image": "alpine-plus",
62-
"type": "plus",
63-
"marker": "'vsr_api or vsr_routing or vsr_canary or vsr_status or vsr_grpc'",
64-
"platforms": "linux/arm64, linux/amd64"
65-
},
663
{
674
"label": "policies 1/2",
685
"image": "ubi-9-plus",
696
"type": "plus",
70-
"marker": "'policies and not policies_ac and not policies_jwt and not policies_mtls'",
7+
"marker": "'policies_paul'",
718
"platforms": "linux/arm64, linux/amd64, linux/s390x"
72-
},
73-
{
74-
"label": "policies 2/2",
75-
"image": "ubi-9-plus",
76-
"type": "plus",
77-
"marker": "'policies_ac or policies_jwt or policies_mtls'",
78-
"platforms": "linux/arm64, linux/amd64, linux/s390x"
79-
},
80-
{
81-
"label": "OIDC-UI 1/1",
82-
"image": "debian-plus",
83-
"type": "plus",
84-
"marker": "oidc",
85-
"platforms": "linux/arm64, linux/amd64"
869
}
8710
],
8811
"k8s": []

‎pyproject.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ markers =[
4747
"multi_ns",
4848
"oidc",
4949
"policies",
50+
"policies_paul",
5051
"policies_rl",
5152
"policies_jwt",
5253
"policies_ac",

0 commit comments

Comments
 (0)