update2

Signed-off-by: lec-bit <glfhzmy@126.com>

Author: lec-bit

test/e2e/baseline_test.go

@@ -1,5 +1,5 @@
-//go:build integ
-// +build integ
+//go:build integ || all
+// +build integ all
 
 /*
  * Copyright The Kmesh Authors.

test/e2e/main_test.go

@@ -1,5 +1,5 @@
-//go:build integ
-// +build integ
+//go:build integ || all
+// +build integ all
 
 /*
  * Copyright The Kmesh Authors.
@@ -24,9 +24,11 @@ import (
 	"time"
 
 	"istio.io/api/label"
-	"istio.io/istio/pkg/config/protocol"
 	"istio.io/istio/pkg/test/framework"
 	"istio.io/istio/pkg/test/framework/components/echo"
+	"istio.io/istio/pkg/test/framework/components/echo/common/ports"
+	"istio.io/istio/pkg/test/framework/components/echo/deployment"
+	"istio.io/istio/pkg/test/framework/components/echo/match"
 	"istio.io/istio/pkg/test/framework/components/namespace"
 	"istio.io/istio/pkg/test/framework/resource"
 )
@@ -38,10 +40,14 @@ var (
 type EchoDeployments struct {
 	Namespace namespace.Instance
 	All       echo.Instances
+
+	// The echo service which is enrolled to Kmesh without waypoint.
+	EnrolledToKmesh echo.Instances
 }
 
 const (
 	ServiceName        = "echo-service"
+	ServiceName2       = "echo-service2"
 	EnrolledToKmesh    = "enrolled-to-kmesh"
 	Timeout            = 2 * time.Minute
 	KmeshReleaseName   = "kmesh"
@@ -76,16 +82,12 @@ func SetupApps(t resource.Context, apps *EchoDeployments) error {
 		return err
 	}
 
-	builder := echo.New(t).
+	builder := deployment.New(t).
 		WithClusters(t.Clusters()...).
 		WithConfig(echo.Config{
-			Service:   ServiceName,
-			Namespace: apps.Namespace,
-			Ports: echo.Ports{{
-				Name:     "http",
-				Protocol: protocol.HTTP,
-				Port:     8080,
-			}},
+			Service:        ServiceName,
+			Namespace:      apps.Namespace,
+			Ports:          ports.All(),
 			ServiceAccount: true,
 			Subsets: []echo.SubsetConfig{
 				{
@@ -105,6 +107,30 @@ func SetupApps(t resource.Context, apps *EchoDeployments) error {
 					},
 				},
 			},
+		}).
+		WithConfig(echo.Config{
+			Service:        ServiceName2,
+			Namespace:      apps.Namespace,
+			Ports:          ports.All(),
+			ServiceAccount: true,
+			Subsets: []echo.SubsetConfig{
+				{
+					Replicas: 1,
+					Version:  "v1",
+					Labels: map[string]string{
+						"app":     ServiceName2,
+						"version": "v1",
+					},
+				},
+				{
+					Replicas: 1,
+					Version:  "v2",
+					Labels: map[string]string{
+						"app":     ServiceName2,
+						"version": "v2",
+					},
+				},
+			},
 		})
 
 	echos, err := builder.Build()
@@ -113,5 +139,7 @@ func SetupApps(t resource.Context, apps *EchoDeployments) error {
 	}
 
 	apps.All = echos
+
+	apps.EnrolledToKmesh = match.ServiceName(echo.NamespacedName{Name: ServiceName2, Namespace: apps.Namespace}).GetMatches(echos)
 	return nil
 }

test/e2e/restart_test.go

@@ -1,5 +1,5 @@
-//go:build integ
-// +build integ
+//go:build integ || all
+// +build integ all
 
 /*
  * Copyright The Kmesh Authors.
@@ -41,8 +41,8 @@ import (
 
 func TestKmeshRestart(t *testing.T) {
 	framework.NewTest(t).Run(func(t framework.TestContext) {
-		src := apps.All[0]
-		dst := apps.All[1]
+		src := apps.All
+		dst := apps.EnrolledToKmesh
 		options := echo.CallOptions{
 			To:    dst,
 			Count: 1,

test/e2e/run_test.sh

@@ -278,15 +278,13 @@ fi
 kubectl config use-context "kind-$NAME"
 echo "Running tests in cluster '$NAME'"
 
-
+sed -i 's/dual-engine/kernel-native/g' $ROOT_DIR/deploy/charts/kmesh-helm/values.yaml
 # make sure the Kmesh local image is ready.
 if [[ -z "${SKIP_SETUP:-}" ]]; then
     setup_istio
     setup_kmesh
 fi
 
-sed -i 's/dual-engine/kernel-native/g' $ROOT_DIR/deploy/charts/kmesh-helm/values.yaml
-
 cmd="go test -v -tags=integ $ROOT_DIR/test/e2e/... -istio.test.kube.loadbalancer=false ${PARAMS[*]}"
 
 bash -c "$cmd"