From 6af361a7d6ae604cf0df0b8e10b63b76c752ce31 Mon Sep 17 00:00:00 2001
From: xiangzihao <460888207@qq.com>
Date: Mon, 17 Jul 2023 19:02:55 +0800
Subject: [PATCH] [CI] Try to fix flaky CI (#14568)

* increase zk timeout in ci

* increase await timeout in WorkflowE2ETest
---
 .github/workflows/cluster-test/mysql/dolphinscheduler_env.sh  | 1 +
 .../workflows/cluster-test/postgresql/dolphinscheduler_env.sh | 1 +
 .../apache/dolphinscheduler/e2e/cases/WorkflowE2ETest.java    | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cluster-test/mysql/dolphinscheduler_env.sh b/.github/workflows/cluster-test/mysql/dolphinscheduler_env.sh
index 10be4d8453..b19bdbcafb 100755
--- a/.github/workflows/cluster-test/mysql/dolphinscheduler_env.sh
+++ b/.github/workflows/cluster-test/mysql/dolphinscheduler_env.sh
@@ -33,6 +33,7 @@ export MASTER_FETCH_COMMAND_NUM=${MASTER_FETCH_COMMAND_NUM:-10}
 # Registry center configuration, determines the type and link of the registry center
 export REGISTRY_TYPE=${REGISTRY_TYPE:-zookeeper}
 export REGISTRY_ZOOKEEPER_CONNECT_STRING=${REGISTRY_ZOOKEEPER_CONNECT_STRING:-zoo1:2181,zoo2:2182,zoo3:2183}
+export REGISTRY_ZOOKEEPER_BLOCK_UNTIL_CONNECTED=30000ms
 
 # Tasks related configurations, need to change the configuration if you use the related tasks.
 export HADOOP_HOME=${HADOOP_HOME:-/opt/soft/hadoop}
diff --git a/.github/workflows/cluster-test/postgresql/dolphinscheduler_env.sh b/.github/workflows/cluster-test/postgresql/dolphinscheduler_env.sh
index 445b5bae99..e7ab832fdd 100644
--- a/.github/workflows/cluster-test/postgresql/dolphinscheduler_env.sh
+++ b/.github/workflows/cluster-test/postgresql/dolphinscheduler_env.sh
@@ -33,6 +33,7 @@ export MASTER_FETCH_COMMAND_NUM=${MASTER_FETCH_COMMAND_NUM:-10}
 # Registry center configuration, determines the type and link of the registry center
 export REGISTRY_TYPE=${REGISTRY_TYPE:-zookeeper}
 export REGISTRY_ZOOKEEPER_CONNECT_STRING=${REGISTRY_ZOOKEEPER_CONNECT_STRING:-zoo1:2181,zoo2:2182,zoo3:2183}
+export REGISTRY_ZOOKEEPER_BLOCK_UNTIL_CONNECTED=30000ms
 
 # Tasks related configurations, need to change the configuration if you use the related tasks.
 export HADOOP_HOME=${HADOOP_HOME:-/opt/soft/hadoop}
diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkflowE2ETest.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkflowE2ETest.java
index a4b1fb9f93..9354b2745e 100644
--- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkflowE2ETest.java
+++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkflowE2ETest.java
@@ -45,6 +45,8 @@ import org.openqa.selenium.support.ui.WebDriverWait;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+import java.time.Duration;
+
 @DolphinScheduler(composeFiles = "docker/basic/docker-compose.yaml")
 class WorkflowE2ETest {
     private static final String project = "test-workflow-1";
@@ -201,7 +203,7 @@ class WorkflowE2ETest {
                 .next()
                 .rerun();
 
-        await().untilAsserted(() -> {
+        await().timeout(Duration.ofSeconds(20)).untilAsserted(() -> {
             browser.navigate().refresh();
 
             final Row row = projectPage