From 0b03f99765efa633d0c6cd359b750127d221bb3c Mon Sep 17 00:00:00 2001
From: Somefive <yd219913@alibaba-inc.com>
Date: Mon, 8 Aug 2022 11:56:44 +0800
Subject: [PATCH] Fix: remove multicluster app test for apply-in-order for
 addon (#4554)

Signed-off-by: Somefive <yd219913@alibaba-inc.com>
---
 .../multicluster_test.go                      | 54 -------------------
 .../testdata/app/app-apply-in-order.yaml      | 37 -------------
 2 files changed, 91 deletions(-)
 delete mode 100644 test/e2e-multicluster-test/testdata/app/app-apply-in-order.yaml

diff --git a/test/e2e-multicluster-test/multicluster_test.go b/test/e2e-multicluster-test/multicluster_test.go
index e85e04aa2..2b000b8b4 100644
--- a/test/e2e-multicluster-test/multicluster_test.go
+++ b/test/e2e-multicluster-test/multicluster_test.go
@@ -365,60 +365,6 @@ var _ = Describe("Test multicluster scenario", func() {
 			}, time.Minute).Should(Succeed())
 		})
 
-		It("Test helm addon relied feature", func() {
-			By("apply application")
-			app := &v1beta1.Application{}
-			bs, err := ioutil.ReadFile("./testdata/app/app-apply-in-order.yaml")
-			Expect(err).Should(Succeed())
-			Expect(yaml.Unmarshal([]byte(bs), app)).Should(Succeed())
-			app.SetNamespace(testNamespace)
-			err = k8sClient.Create(hubCtx, app)
-			Expect(err).Should(Succeed())
-			By("wait application resource ready")
-			targetNamespace := "test-addon-namespace"
-			Eventually(func() error {
-				// check deployments in clusters
-				ns := corev1.Namespace{}
-				if err := k8sClient.Get(hubCtx, types.NamespacedName{Name: targetNamespace}, &ns); err != nil {
-					return err
-				}
-				svc := corev1.Service{}
-				if err := k8sClient.Get(hubCtx, types.NamespacedName{Namespace: targetNamespace, Name: "addon-fluxcd-service"}, &svc); err != nil {
-					return err
-				}
-				return nil
-			}, 20*time.Minute).Should(Succeed())
-
-			Eventually(func() error {
-				// check deployments in clusters
-				ns := corev1.Namespace{}
-				if err := k8sClient.Get(workerCtx, types.NamespacedName{Name: targetNamespace}, &ns); err != nil {
-					return err
-				}
-				svc := corev1.Service{}
-				if err := k8sClient.Get(workerCtx, types.NamespacedName{Namespace: targetNamespace, Name: "addon-fluxcd-service"}, &svc); err != nil {
-					return err
-				}
-				return nil
-			}, 20*time.Minute).Should(Succeed())
-
-			checkApp := v1beta1.Application{}
-			Eventually(func() error {
-				err := k8sClient.Get(hubCtx, types.NamespacedName{Namespace: testNamespace, Name: app.Name}, &checkApp)
-				if err != nil {
-					return err
-				}
-				if checkApp.Status.Phase != common.ApplicationRunning {
-					return fmt.Errorf("application not running")
-				}
-				return nil
-			}, 30*time.Minute, 500*time.Millisecond).Should(BeNil())
-
-			By("test delete env")
-			err = k8sClient.Delete(hubCtx, &checkApp)
-			Expect(err).Should(BeNil())
-		})
-
 		It("Test deploy multi-cluster application with target", func() {
 			By("apply application")
 			app := &v1beta1.Application{
diff --git a/test/e2e-multicluster-test/testdata/app/app-apply-in-order.yaml b/test/e2e-multicluster-test/testdata/app/app-apply-in-order.yaml
deleted file mode 100644
index c16866a58..000000000
--- a/test/e2e-multicluster-test/testdata/app/app-apply-in-order.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: addon-fluxcd
-  namespace: TEST_NAMESPACE
-spec:
-  components:
-    - name: flux-system-namespace
-      properties:
-        apiVersion: v1
-        kind: Namespace
-        metadata:
-          name: test-addon-namespace
-      type: raw
-    - name: service
-      properties:
-        apiVersion: v1
-        kind: Service
-        metadata:
-          name: addon-fluxcd-service
-          namespace: test-addon-namespace
-        spec:
-          ports:
-            - name: http
-              port: 80
-              protocol: TCP
-              targetPort: http-webhook
-          selector:
-            app: notification-controller
-          type: ClusterIP
-      type: raw
-  workflow:
-    steps:
-      - name: deploy-control-plane
-        type: apply-application
-      - name: deploy-runtime
-        type: deploy2runtime
\ No newline at end of file