You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2023/03/13 09:11:03 UTC
[shardingsphere] branch master updated: Refactor : refactor the timeout for db scenario (#24575) (#24576)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new c4e3bd75f70 Refactor : refactor the timeout for db scenario (#24575) (#24576)
c4e3bd75f70 is described below
commit c4e3bd75f70149daa7df5ec197e0ba2da31978b4
Author: 孙念君 Nianjun Sun <su...@apache.org>
AuthorDate: Mon Mar 13 17:10:55 2023 +0800
Refactor : refactor the timeout for db scenario (#24575) (#24576)
---
.github/workflows/e2e.yml | 2 +-
.github/workflows/nightly-e2e.yml | 2 +-
.../test/e2e/env/container/atomic/storage/impl/MySQLContainer.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index a67d99c21ad..893668242af 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -137,7 +137,7 @@ jobs:
name: single rule
needs: it-empty-rule
runs-on: ubuntu-latest
- timeout-minutes: 10
+ timeout-minutes: 15
strategy:
matrix:
adapter: [ proxy, jdbc ]
diff --git a/.github/workflows/nightly-e2e.yml b/.github/workflows/nightly-e2e.yml
index e8399ee06a1..0204f6b2cf6 100644
--- a/.github/workflows/nightly-e2e.yml
+++ b/.github/workflows/nightly-e2e.yml
@@ -102,7 +102,7 @@ jobs:
name: single rule
needs: it-empty-rule
runs-on: ubuntu-latest
- timeout-minutes: 10
+ timeout-minutes: 15
strategy:
max-parallel: 2
fail-fast: false
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MySQLContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MySQLContainer.java
index d6f341529ee..c2df69a4d54 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MySQLContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MySQLContainer.java
@@ -37,7 +37,7 @@ public final class MySQLContainer extends DockerStorageContainer {
private final StorageContainerConfiguration storageContainerConfig;
public MySQLContainer(final String containerImage, final String scenario, final StorageContainerConfiguration storageContainerConfig) {
- super(TypedSPILoader.getService(DatabaseType.class, "MySQL"), Strings.isNullOrEmpty(containerImage) ? "mysql/mysql-server:5.7" : containerImage, scenario);
+ super(TypedSPILoader.getService(DatabaseType.class, "MySQL"), Strings.isNullOrEmpty(containerImage) ? "mysql/mysql-server:5.7.39" : containerImage, scenario);
this.storageContainerConfig = storageContainerConfig;
}