From 1053501df121e5ff33a926dc33b8309b0b54bf6a Mon Sep 17 00:00:00 2001 From: wyike Date: Tue, 2 Aug 2022 15:16:42 +0800 Subject: [PATCH] Fix: fix e2e flaky tests (#4521) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * try to show Signed-off-by: 楚岳 test Signed-off-by: 楚岳 fix e2e tests Signed-off-by: 楚岳 add mock server back Signed-off-by: 楚岳 fix flaky tests Signed-off-by: 楚岳 fix tests Signed-off-by: 楚岳 fix e2e-test Signed-off-by: 楚岳 only for tests Signed-off-by: 楚岳 fix * only for tests Signed-off-by: 楚岳 --- e2e/addon/mock/utils/utils.go | 2 ++ makefiles/e2e.mk | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/e2e/addon/mock/utils/utils.go b/e2e/addon/mock/utils/utils.go index 63fe363bd..4a3425c2d 100644 --- a/e2e/addon/mock/utils/utils.go +++ b/e2e/addon/mock/utils/utils.go @@ -76,6 +76,8 @@ func ApplyMockServerConfig() error { } else { cm.ResourceVersion = originCm.ResourceVersion if err = k8sClient.Update(ctx, &cm); err != nil { + fmt.Println("print errr------") + fmt.Println(err) return err } } diff --git a/makefiles/e2e.mk b/makefiles/e2e.mk index ac8b70a51..dda4ef40a 100644 --- a/makefiles/e2e.mk +++ b/makefiles/e2e.mk @@ -8,7 +8,8 @@ e2e-setup-core-post-hook: helm upgrade --install --namespace vela-system --wait oam-rollout --set image.repository=vela-runtime-rollout-test --set image.tag=$(GIT_COMMIT) ./runtime/rollout/charts go run ./e2e/addon/mock & sleep 15 - bin/vela addon enable rollout + bin/vela addon enable ./e2e/addon/mock/testdata/fluxcd + bin/vela addon enable ./e2e/addon/mock/testdata/rollout .PHONY: e2e-setup-core-wo-auth e2e-setup-core-wo-auth: @@ -37,10 +38,10 @@ e2e-setup: go run ./e2e/addon/mock & sleep 15 - bin/vela addon enable fluxcd - bin/vela addon enable terraform - bin/vela addon enable terraform-alibaba ALICLOUD_ACCESS_KEY=xxx ALICLOUD_SECRET_KEY=yyy ALICLOUD_REGION=cn-beijing - bin/vela addon enable rollout + bin/vela addon enable ./e2e/addon/mock/testdata/fluxcd + bin/vela addon enable ./e2e/addon/mock/testdata/terraform + bin/vela addon enable ./e2e/addon/mock/testdata/terraform-alibaba ALICLOUD_ACCESS_KEY=xxx ALICLOUD_SECRET_KEY=yyy ALICLOUD_REGION=cn-beijing + bin/vela addon enable ./e2e/addon/mock/testdata/rollout ginkgo version ginkgo -v -r e2e/setup