From dc9ad2274b23bf58acd85d2dec0bca6a54eafc2a Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Tue, 19 Dec 2023 12:02:29 +0000 Subject: [PATCH 1/3] disable flakey test --- tests/suite/test_virtual_server_backup_service.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/suite/test_virtual_server_backup_service.py b/tests/suite/test_virtual_server_backup_service.py index 776fd62d9c..7bfc5dfad4 100644 --- a/tests/suite/test_virtual_server_backup_service.py +++ b/tests/suite/test_virtual_server_backup_service.py @@ -107,6 +107,7 @@ def fin(): @pytest.mark.vs @pytest.mark.skip_for_nginx_oss @pytest.mark.backup_service +@pytest.mark.skip @pytest.mark.parametrize( "crd_ingress_controller, virtual_server_setup", [ From b499fd23a3802e0f56d417c25585085863da4fbc Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Tue, 19 Dec 2023 12:03:21 +0000 Subject: [PATCH 2/3] reorder test jobs to reduce timings --- .github/workflows/ci.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 966febbc22..c9fad642e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -282,18 +282,17 @@ jobs: {\"image\": \"alpine\", \"marker\":\"'policies and not policies_rl and not policies_ac and not policies_jwt and not policies_mtls'\"}, \ {\"image\": \"alpine\", \"marker\":\"'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 or vs_certmanager'\"}, \ - {\"image\": \"debian\", \"marker\": \"'vs_certmanager'\"}, \ + {\"image\": \"debian\", \"marker\": \"'vs_responses or vs_grpc or vs_redirects or vs_externalname or vs_externaldns or vs_certmanager'\"}, \ + {\"image\": \"debian\", \"marker\": \"'vs_ipv6 or vs_rewrite or vs_certmanager'\"}, \ {\"image\": \"ubi\", \"marker\": \"ts\"}, \ {\"image\": \"debian-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'\"}, \ - {\"image\": \"debian-plus\", \"marker\": \"'vs_ipv6 or vs_rewrite or vs_responses or vs_grpc or vs_redirects or vs_externalname or vs_externaldns or vs_certmanager'\"}, \ - {\"image\": \"debian-plus\", \"marker\": \"vs_certmanager\"}, \ + {\"image\": \"debian-plus\", \"marker\": \"'vs_responses or vs_grpc or vs_redirects or vs_externalname or vs_externaldns or vs_certmanager'\"}, \ + {\"image\": \"debian-plus\", \"marker\": \"'vs_ipv6 or vs_rewrite or vs_certmanager'\"}, \ {\"image\": \"debian-plus\", \"marker\": \"ts\"}, \ {\"image\": \"alpine-plus\", \"marker\":\"ingresses\"}, \ {\"image\": \"alpine-plus\", \"marker\": \"vsr\"}, \ - {\"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_rl or policies_ac or policies_jwt or policies_mtls'\"}, \ - {\"image\": \"debian-plus-nap\", \"marker\": \"appprotect_integration\"}, \ + {\"image\": \"ubi-plus\", \"marker\":\"'policies and not policies_ac and not policies_jwt and not policies_mtls'\"}, \ + {\"image\": \"ubi-plus\", \"marker\":\"'policies_ac or policies_jwt or policies_mtls'\"}, \ {\"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\"}, \ From 5eb9d493a7664d24e5144cd7a027c5396f3e413b Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Tue, 19 Dec 2023 13:38:53 +0000 Subject: [PATCH 3/3] remove duplicate certmanager --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06bc50371f..7c80537e1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -282,12 +282,12 @@ jobs: {\"image\": \"alpine\", \"marker\":\"'policies and not policies_rl and not policies_ac and not policies_jwt and not policies_mtls'\"}, \ {\"image\": \"alpine\", \"marker\":\"'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_responses or vs_grpc or vs_redirects or vs_externalname or vs_externaldns or vs_certmanager'\"}, \ - {\"image\": \"debian\", \"marker\": \"'vs_ipv6 or vs_rewrite or vs_certmanager'\"}, \ + {\"image\": \"debian\", \"marker\": \"'vs_grpc or vs_redirects or vs_externalname or vs_externaldns'\"}, \ + {\"image\": \"debian\", \"marker\": \"'vs_responses or vs_ipv6 or vs_rewrite or vs_certmanager'\"}, \ {\"image\": \"ubi\", \"marker\": \"ts\"}, \ {\"image\": \"debian-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'\"}, \ - {\"image\": \"debian-plus\", \"marker\": \"'vs_responses or vs_grpc or vs_redirects or vs_externalname or vs_externaldns or vs_certmanager'\"}, \ - {\"image\": \"debian-plus\", \"marker\": \"'vs_ipv6 or vs_rewrite or vs_certmanager'\"}, \ + {\"image\": \"debian-plus\", \"marker\": \"'vs_grpc or vs_redirects or vs_externalname or vs_externaldns'\"}, \ + {\"image\": \"debian-plus\", \"marker\": \"'vs_responses or vs_ipv6 or vs_rewrite or vs_certmanager'\"}, \ {\"image\": \"debian-plus\", \"marker\": \"ts\"}, \ {\"image\": \"alpine-plus\", \"marker\":\"ingresses\"}, \ {\"image\": \"alpine-plus\", \"marker\": \"vsr\"}, \