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

Move some python tests from vs1 to vs2 #5888

Merged
merged 2 commits into from
Jun 28, 2024
Merged

Move some python tests from vs1 to vs2 #5888

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
816aa17
more tests from vs1 to vs2
Jun 28, 2024
461dd5d
Merge branch 'main' into chore/further-split-vs-matrix
Jun 28, 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
4 changes: 2 additions & 2 deletions .github/data/matrix-smoke-oss.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@
"label": "VS 1/3",
"image": "debian",
"type": "oss",
"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'",
"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'",
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
},
{
"label": "VS 2/3",
"image": "debian",
"type": "oss",
"marker": "'vs_grpc or vs_redirects or vs_externalname or vs_externaldns'",
"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'",
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
},
{
Expand Down
4 changes: 2 additions & 2 deletions .github/data/matrix-smoke-plus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"label": "VS 1/3",
"image": "debian-plus",
"type": "plus",
"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'",
"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'",
"platforms": "linux/arm64, linux/amd64"
},
{
"label": "VS 2/3",
"image": "debian-plus",
"type": "plus",
"marker": "'vs_grpc or vs_redirects or vs_externalname or vs_externaldns'",
"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'",
"platforms": "linux/arm64, linux/amd64"
},
{
Expand Down
1 change: 1 addition & 0 deletions tests/suite/test_virtual_server_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@


@pytest.mark.vs
@pytest.mark.vs_api
@pytest.mark.skip_for_nginx_oss
@pytest.mark.parametrize(
"crd_ingress_controller, virtual_server_setup",
Expand Down
1 change: 1 addition & 0 deletions tests/suite/test_virtual_server_backup_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ def fin():


@pytest.mark.vs
@pytest.mark.vs_backup
@pytest.mark.skip_for_nginx_oss
@pytest.mark.skip(reason="issue with VS config")
@pytest.mark.parametrize(
Expand Down
2 changes: 2 additions & 0 deletions tests/suite/test_virtual_server_configmap_keys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ def fin():


@pytest.mark.vs
@pytest.mark.vs_config_map
@pytest.mark.parametrize(
"crd_ingress_controller, virtual_server_setup",
[
Expand Down Expand Up @@ -342,6 +343,7 @@ def test_keys_in_main_config(


@pytest.mark.vs
@pytest.mark.vs_config_map
@pytest.mark.parametrize(
"crd_ingress_controller, virtual_server_setup",
[
Expand Down
1 change: 1 addition & 0 deletions tests/suite/test_virtual_server_focused_canary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ def get_upstreams_of_splitting(file) -> []:


@pytest.mark.vs
@pytest.mark.vs_canary
@pytest.mark.parametrize(
"crd_ingress_controller, virtual_server_setup",
[
Expand Down
3 changes: 3 additions & 0 deletions tests/suite/test_virtual_server_upstream_options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@


@pytest.mark.vs
@pytest.mark.vs_upstream
@pytest.mark.parametrize(
"crd_ingress_controller, virtual_server_setup",
[
Expand Down Expand Up @@ -354,6 +355,7 @@ def test_v_s_overrides_config_map(


@pytest.mark.vs
@pytest.mark.vs_upstream
@pytest.mark.parametrize(
"crd_ingress_controller, virtual_server_setup",
[
Expand Down Expand Up @@ -471,6 +473,7 @@ def test_openapi_validation_flow(


@pytest.mark.vs
@pytest.mark.vs_upstream
@pytest.mark.skip_for_nginx_oss
@pytest.mark.parametrize(
"crd_ingress_controller, virtual_server_setup",
Expand Down
1 change: 1 addition & 0 deletions tests/suite/test_virtual_server_use_cluster_ip_reloads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@


@pytest.mark.vs
@pytest.mark.vs_use_cluster_ip
@pytest.mark.parametrize(
"crd_ingress_controller, virtual_server_setup",
[
Expand Down
Loading