upgrade grpc to remove warning (#1757)

* upgrade grpc to remove warning
Signed-off-by: YangKeao <keao.yang@yahoo.com>

* make e2e test a standalone module
Signed-off-by: YangKeao <keao.yang@yahoo.com>

* clean the go.mod and go.sum files
Signed-off-by: YangKeao <keao.yang@yahoo.com>

* make check
Signed-off-by: YangKeao <keao.yang@yahoo.com>

* move integration test
Signed-off-by: YangKeao <keao.yang@yahoo.com>

* update e2e-test
Signed-off-by: YangKeao <keao.yang@yahoo.com>

* fix gitignore
Signed-off-by: YangKeao <keao.yang@yahoo.com>
Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>

.dockerignore

@@ -7,6 +7,7 @@
 !hack
 !docs
 !test
+!e2e-test
 !ui
 !tools
 !images

.gitignore

@@ -29,8 +29,8 @@ node_modules
 output/
 _artifacts/
 
-test/image/e2e/chaos-mesh
-test/image/e2e/manifests/
+e2e-test/image/e2e/chaos-mesh
+e2e-test/image/e2e/manifests/
 
 /pkg/uiserver/embedded_assets_handler.go
 
@@ -41,4 +41,4 @@ test/image/e2e/manifests/
 !/images/*/bin/.gitkeep
 
 .dockerbuilt
-Dockerfile
+/Dockerfile

Makefile

@@ -264,28 +264,28 @@ prepare-e2e: e2e-image docker-push-e2e
 
 GINKGO_FLAGS ?=
 e2e: e2e-build
-	./test/image/e2e/bin/ginkgo ${GINKGO_FLAGS} ./test/image/e2e/bin/e2e.test -- --e2e-image ${DOCKER_REGISTRY_PREFIX}pingcap/e2e-helper:${IMAGE_TAG}
+	./e2e-test/image/e2e/bin/ginkgo ${GINKGO_FLAGS} ./e2e-test/image/e2e/bin/e2e.test -- --e2e-image ${DOCKER_REGISTRY_PREFIX}pingcap/e2e-helper:${IMAGE_TAG}
 
-image-chaos-mesh-e2e-dependencies += test/image/e2e/manifests test/image/e2e/chaos-mesh e2e-build
-CLEAN_TARGETS += test/image/e2e/manifests test/image/e2e/chaos-mesh
+image-chaos-mesh-e2e-dependencies += e2e-test/image/e2e/manifests e2e-test/image/e2e/chaos-mesh e2e-build
+CLEAN_TARGETS += e2e-test/image/e2e/manifests e2e-test/image/e2e/chaos-mesh
 
-e2e-build: test/image/e2e/bin/ginkgo test/image/e2e/bin/e2e.test
+e2e-build: e2e-test/image/e2e/bin/ginkgo e2e-test/image/e2e/bin/e2e.test
 
-CLEAN_TARGETS+=test/image/e2e/bin/ginkgo
-test/image/e2e/bin/ginkgo:
-	$(GO) build -ldflags "$(LDFLAGS)" -tags "${BUILD_TAGS}" -o test/image/e2e/bin/ginkgo github.com/onsi/ginkgo/ginkgo
+CLEAN_TARGETS+=e2e-test/image/e2e/bin/ginkgo
+e2e-test/image/e2e/bin/ginkgo:
+	cd e2e-test && $(GO) build -ldflags "$(LDFLAGS)" -tags "${BUILD_TAGS}" -o image/e2e/bin/ginkgo github.com/onsi/ginkgo/ginkgo
 
-CLEAN_TARGETS+=test/image/e2e/bin/e2e.test
-test/image/e2e/bin/e2e.test:
-	$(GO) test -c  -o ./test/image/e2e/bin/e2e.test ./test/e2e
+CLEAN_TARGETS+=e2e-test/image/e2e/bin/e2e.test
+e2e-test/image/e2e/bin/e2e.test:
+	cd e2e-test && $(GO) test -c  -o ./image/e2e/bin/e2e.test ./e2e
 
-test/image/e2e/manifests: manifests
-	rm -rf test/image/e2e/manifests
-	cp -r manifests test/image/e2e
+e2e-test/image/e2e/manifests: manifests
+	rm -rf e2e-test/image/e2e/manifests
+	cp -r manifests e2e-test/image/e2e
 
-test/image/e2e/chaos-mesh: helm/chaos-mesh
-	rm -rf test/image/e2e/chaos-mesh
-	cp -r helm/chaos-mesh test/image/e2e
+e2e-test/image/e2e/chaos-mesh: helm/chaos-mesh
+	rm -rf e2e-test/image/e2e/chaos-mesh
+	cp -r helm/chaos-mesh e2e-test/image/e2e
 
 define IMAGE_TEMPLATE
 CLEAN_TARGETS += $(2)/.dockerbuilt
@@ -313,9 +313,9 @@ $(eval $(call IMAGE_TEMPLATE,chaos-daemon,images/chaos-daemon))
 $(eval $(call IMAGE_TEMPLATE,chaos-mesh,images/chaos-mesh))
 $(eval $(call IMAGE_TEMPLATE,chaos-dashboard,images/chaos-dashboard))
 $(eval $(call IMAGE_TEMPLATE,build-env,images/build-env))
-$(eval $(call IMAGE_TEMPLATE,e2e-helper,test/cmd/e2e_helper))
+$(eval $(call IMAGE_TEMPLATE,e2e-helper,e2e-test/cmd/e2e_helper))
 $(eval $(call IMAGE_TEMPLATE,chaos-mesh-protoc,hack/protoc))
-$(eval $(call IMAGE_TEMPLATE,chaos-mesh-e2e,test/image/e2e))
+$(eval $(call IMAGE_TEMPLATE,chaos-mesh-e2e,e2e-test/image/e2e))
 $(eval $(call IMAGE_TEMPLATE,chaos-kernel,images/chaos-kernel))
 $(eval $(call IMAGE_TEMPLATE,chaos-jvm,images/chaos-jvm))
 

test/action.go → e2e-test/action.go

@@ -29,8 +29,8 @@ import (
 	"k8s.io/klog"
 	aggregatorclientset "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
 
-	"github.com/chaos-mesh/chaos-mesh/test/e2e/e2econst"
-	e2eutil "github.com/chaos-mesh/chaos-mesh/test/e2e/util"
+	"github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/e2econst"
+	e2eutil "github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/util"
 )
 
 const (

test/e2e/chaos/basic.go → e2e-test/e2e/chaos/basic.go

@@ -32,20 +32,20 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/chaos-mesh/chaos-mesh/api/v1alpha1"
+	e2econfig "github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/config"
+	"github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/e2econst"
+	"github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/util"
+	"github.com/chaos-mesh/chaos-mesh/e2e-test/pkg/fixture"
 	"github.com/chaos-mesh/chaos-mesh/pkg/portforward"
-	e2econfig "github.com/chaos-mesh/chaos-mesh/test/e2e/config"
-	"github.com/chaos-mesh/chaos-mesh/test/e2e/e2econst"
-	"github.com/chaos-mesh/chaos-mesh/test/e2e/util"
-	"github.com/chaos-mesh/chaos-mesh/test/pkg/fixture"
 
 	// testcases
-	dnschaostestcases "github.com/chaos-mesh/chaos-mesh/test/e2e/chaos/dnschaos"
-	iochaostestcases "github.com/chaos-mesh/chaos-mesh/test/e2e/chaos/iochaos"
-	networkchaostestcases "github.com/chaos-mesh/chaos-mesh/test/e2e/chaos/networkchaos"
-	podchaostestcases "github.com/chaos-mesh/chaos-mesh/test/e2e/chaos/podchaos"
-	sidecartestcases "github.com/chaos-mesh/chaos-mesh/test/e2e/chaos/sidecar"
-	stresstestcases "github.com/chaos-mesh/chaos-mesh/test/e2e/chaos/stresschaos"
-	timechaostestcases "github.com/chaos-mesh/chaos-mesh/test/e2e/chaos/timechaos"
+	dnschaostestcases "github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/chaos/dnschaos"
+	iochaostestcases "github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/chaos/iochaos"
+	networkchaostestcases "github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/chaos/networkchaos"
+	podchaostestcases "github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/chaos/podchaos"
+	sidecartestcases "github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/chaos/sidecar"
+	stresstestcases "github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/chaos/stresschaos"
+	timechaostestcases "github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/chaos/timechaos"
 )
 
 var _ = ginkgo.Describe("[Basic]", func() {

test/e2e/chaos/dnschaos/dns.go → e2e-test/e2e/chaos/dnschaos/dns.go

@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/chaos-mesh/chaos-mesh/api/v1alpha1"
-	"github.com/chaos-mesh/chaos-mesh/test/e2e/util"
+	"github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/util"
 )
 
 func TestcaseDNSRandom(

test/e2e/chaos/iochaos/io_delay.go → e2e-test/e2e/chaos/iochaos/io_delay.go

@@ -29,7 +29,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/chaos-mesh/chaos-mesh/api/v1alpha1"
-	"github.com/chaos-mesh/chaos-mesh/test/e2e/util"
+	"github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/util"
 )
 
 func TestcaseIODelayDurationForATimeThenRecover(

test/e2e/chaos/iochaos/io_error.go → e2e-test/e2e/chaos/iochaos/io_error.go

@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/chaos-mesh/chaos-mesh/api/v1alpha1"
-	"github.com/chaos-mesh/chaos-mesh/test/e2e/util"
+	"github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/util"
 )
 
 func TestcaseIOErrorDurationForATimeThenRecover(

test/e2e/chaos/iochaos/io_mistake.go → e2e-test/e2e/chaos/iochaos/io_mistake.go

@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/chaos-mesh/chaos-mesh/api/v1alpha1"
-	"github.com/chaos-mesh/chaos-mesh/test/e2e/util"
+	"github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/util"
 )
 
 func TestcaseIOMistakeDurationForATimeThenRecover(

test/e2e/chaos/networkchaos/network_delay.go → e2e-test/e2e/chaos/networkchaos/network_delay.go

@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/chaos-mesh/chaos-mesh/api/v1alpha1"
-	"github.com/chaos-mesh/chaos-mesh/test/e2e/util"
+	"github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/util"
 )
 
 func TestcaseNetworkDelay(

test/e2e/chaos/networkchaos/network_partition.go → e2e-test/e2e/chaos/networkchaos/network_partition.go

@@ -30,8 +30,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/chaos-mesh/chaos-mesh/api/v1alpha1"
-	"github.com/chaos-mesh/chaos-mesh/test/e2e/util"
-	"github.com/chaos-mesh/chaos-mesh/test/pkg/fixture"
+	"github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/util"
+	"github.com/chaos-mesh/chaos-mesh/e2e-test/pkg/fixture"
 )
 
 // TestcaseForbidHostNetwork We do NOT allow that inject chaos on a pod which uses hostNetwork

test/e2e/chaos/networkchaos/network_peers_crossover.go → e2e-test/e2e/chaos/networkchaos/network_peers_crossover.go

@@ -26,7 +26,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/chaos-mesh/chaos-mesh/api/v1alpha1"
-	"github.com/chaos-mesh/chaos-mesh/test/e2e/util"
+	"github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/util"
 )
 
 // This test case is for https://github.com/chaos-mesh/chaos-mesh/issues/1450

test/e2e/chaos/podchaos/container_kill.go → e2e-test/e2e/chaos/podchaos/container_kill.go

@@ -29,8 +29,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/chaos-mesh/chaos-mesh/api/v1alpha1"
-	"github.com/chaos-mesh/chaos-mesh/test/e2e/util"
-	"github.com/chaos-mesh/chaos-mesh/test/pkg/fixture"
+	"github.com/chaos-mesh/chaos-mesh/e2e-test/e2e/util"
+	"github.com/chaos-mesh/chaos-mesh/e2e-test/pkg/fixture"
 )
 
 func TestcaseContainerKillOnceThenDelete(ns string, kubeCli kubernetes.Interface, cli client.Client) {