From 44d5df245db6a61433a98a9400870b89dc543384 Mon Sep 17 00:00:00 2001 From: noobwei Date: Fri, 27 Sep 2024 10:51:48 +0800 Subject: [PATCH 1/3] E2E Enhancement Draft Signed-off-by: noobwei --- test/e2e/run_test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/e2e/run_test.sh b/test/e2e/run_test.sh index a9217cb19..32160dc13 100755 --- a/test/e2e/run_test.sh +++ b/test/e2e/run_test.sh @@ -285,4 +285,5 @@ fi if [[ -n "${CLEANUP_REGISTRY}" ]]; then cleanup_docker_registry -fi \ No newline at end of file +fi +# Draft \ No newline at end of file From c8e2177fc0f8193e635f3e28473c0d55518c5a64 Mon Sep 17 00:00:00 2001 From: noobwei Date: Mon, 21 Oct 2024 16:27:21 +0800 Subject: [PATCH 2/3] Add TestServiceRestart and Enable New Param Signed-off-by: noobwei --- test/e2e/baseline_test.go | 35 +++++++++++++++++++++++++++++++++++ test/e2e/run_test.sh | 7 +++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/test/e2e/baseline_test.go b/test/e2e/baseline_test.go index 3179c59d4..ca2f2ba47 100644 --- a/test/e2e/baseline_test.go +++ b/test/e2e/baseline_test.go @@ -42,6 +42,7 @@ import ( "istio.io/istio/pkg/test/framework/components/echo" "istio.io/istio/pkg/test/framework/components/echo/check" "istio.io/istio/pkg/test/framework/components/echo/common/ports" + "istio.io/istio/pkg/test/framework/components/echo/util/traffic" "istio.io/istio/pkg/test/framework/components/prometheus" testKube "istio.io/istio/pkg/test/kube" "istio.io/istio/pkg/test/shell" @@ -909,3 +910,37 @@ func PromDiff(t test.Failer, prom prometheus.Instance, cluster cluster.Cluster, } } + +func TestServiceRestart(t *testing.T) { + const callInterval = 100 * time.Millisecond + successThreshold := 1.0 + framework.NewTest(t).Run(func(t framework.TestContext) { + for _, dst := range apps.EnrolledToKmesh { + generators := []traffic.Generator{} + mkGen := func(src echo.Caller) { + g := traffic.NewGenerator(t, traffic.Config{ + Source: src, + Options: echo.CallOptions{ + To: dst, + Count: 1, + Check: check.OK(), + HTTP: echo.HTTP{Path: "/?delay=10ms"}, + Port: echo.Port{ + Name: "http", + }, + Retry: echo.Retry{NoRetry: true}, + }, + Interval: callInterval, + }).Start() + generators = append(generators, g) + } + mkGen(dst) + if err := dst.Restart(); err != nil { + t.Fatal(err) + } + for _, gen := range generators { + gen.Stop().CheckSuccessRate(t, successThreshold) + } + } + }) +} diff --git a/test/e2e/run_test.sh b/test/e2e/run_test.sh index 32160dc13..819206acf 100755 --- a/test/e2e/run_test.sh +++ b/test/e2e/run_test.sh @@ -243,6 +243,10 @@ while (( "$#" )); do CLEANUP_REGISTRY=true shift ;; + --skip-cleanup-apps) + PARAMS+=("--istio.test.noCleanup") + shift + ;; *) PARAMS+=("$1") shift @@ -285,5 +289,4 @@ fi if [[ -n "${CLEANUP_REGISTRY}" ]]; then cleanup_docker_registry -fi -# Draft \ No newline at end of file +fi \ No newline at end of file From 2541f1827929814edf2f0d67e2cca458582ebcf4 Mon Sep 17 00:00:00 2001 From: noobwei Date: Wed, 23 Oct 2024 21:59:11 +0800 Subject: [PATCH 3/3] Update baseline_test.go Signed-off-by: noobwei --- test/e2e/baseline_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/e2e/baseline_test.go b/test/e2e/baseline_test.go index ca2f2ba47..3962fbaab 100644 --- a/test/e2e/baseline_test.go +++ b/test/e2e/baseline_test.go @@ -928,13 +928,12 @@ func TestServiceRestart(t *testing.T) { Port: echo.Port{ Name: "http", }, - Retry: echo.Retry{NoRetry: true}, }, Interval: callInterval, }).Start() generators = append(generators, g) } - mkGen(dst) + mkGen(apps.ServiceWithWaypointAtServiceGranularity[0]) if err := dst.Restart(); err != nil { t.Fatal(err) }