Skip to content

Commit 127b424

Browse files
author
Jim Ryan
committed
Split VSR matrix in 3 (#5883)
* Split VSR matrix in 3 * fix quotes * simplify marker
1 parent abd6637 commit 127b424

20 files changed

+188
-0
lines changed

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

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
{
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'",
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'",
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+
],
81+
"k8s": []
82+
}

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

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
{
2+
"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'",
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'",
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",
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",
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+
},
66+
{
67+
"label": "policies 1/2",
68+
"image": "ubi-plus",
69+
"type": "plus",
70+
"marker": "'policies and not policies_ac and not policies_jwt and not policies_mtls'",
71+
"platforms": "linux/arm64, linux/amd64, linux/s390x"
72+
},
73+
{
74+
"label": "policies 2/2",
75+
"image": "ubi-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+
"k8s": []
82+
}

‎tests/suite/test_rewrites.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ def test_vs_rewrite(self, vs_rewrites_setup, path, args, cookies, expected):
112112
assert f"URI: {expected}\nRequest" in resp.text
113113

114114
@pytest.mark.vsr
115+
@pytest.mark.vsr_rewrite
115116
@pytest.mark.parametrize("path,args,cookies,expected", test_data)
116117
def test_vsr_rewrite(self, vsr_rewrites_setup, path, args, cookies, expected):
117118
"""

‎tests/suite/test_v_s_route.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ def assert_locations_not_in_config(config, paths):
4949

5050
@pytest.mark.smoke
5151
@pytest.mark.vsr
52+
@pytest.mark.vsr_basic
5253
@pytest.mark.parametrize(
5354
"crd_ingress_controller, v_s_route_setup",
5455
[({"type": "complete", "extra_args": [f"-enable-custom-resources"]}, {"example": "virtual-server-route"})],
@@ -267,6 +268,7 @@ def test_responses_and_events_in_flow(
267268

268269

269270
@pytest.mark.vsr
271+
@pytest.mark.vsr_basic
270272
@pytest.mark.parametrize(
271273
"crd_ingress_controller, v_s_route_setup",
272274
[({"type": "complete", "extra_args": [f"-enable-custom-resources"]}, {"example": "virtual-server-route"})],
@@ -369,6 +371,7 @@ def test_openapi_validation_flow(
369371

370372

371373
@pytest.mark.vsr
374+
@pytest.mark.vsr_basic
372375
@pytest.mark.flaky(max_runs=3)
373376
@pytest.mark.parametrize(
374377
"crd_ingress_controller, v_s_route_setup",

‎tests/suite/test_v_s_route_advanced_routing.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ def fin():
107107

108108

109109
@pytest.mark.vsr
110+
@pytest.mark.vsr_routing
110111
@pytest.mark.parametrize(
111112
"crd_ingress_controller, vsr_adv_routing_setup",
112113
[

‎tests/suite/test_v_s_route_api.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99

1010
@pytest.mark.vsr
11+
@pytest.mark.vsr_api
1112
@pytest.mark.skip_for_nginx_oss
1213
@pytest.mark.parametrize(
1314
"crd_ingress_controller, v_s_route_setup",

‎tests/suite/test_v_s_route_canned_responses.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616

1717
@pytest.mark.vsr
18+
@pytest.mark.vsr_canned
1819
@pytest.mark.parametrize(
1920
"crd_ingress_controller, v_s_route_setup",
2021
[

‎tests/suite/test_v_s_route_error_pages.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515

1616
@pytest.mark.vsr
17+
@pytest.mark.vsr_error_pages
1718
@pytest.mark.parametrize(
1819
"crd_ingress_controller, v_s_route_setup",
1920
[

‎tests/suite/test_v_s_route_externalname.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ def fin():
129129

130130

131131
@pytest.mark.vsr
132+
@pytest.mark.vsr_external_name
132133
@pytest.mark.skip_for_nginx_oss
133134
@pytest.mark.parametrize(
134135
"crd_ingress_controller, vsr_externalname_setup",

‎tests/suite/test_v_s_route_focused_canary.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ def fin():
116116

117117
@pytest.mark.flaky(max_runs=3)
118118
@pytest.mark.vsr
119+
@pytest.mark.vsr_canary
119120
@pytest.mark.parametrize(
120121
"crd_ingress_controller, vsr_canary_setup",
121122
[

0 commit comments

Comments
 (0)