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 790d5e0e2de Bump testcontainers to 1.17.3 (#19730)
790d5e0e2de is described below
commit 790d5e0e2ded6951c7b3dc33f125b73a6a123ec0
Author: 吴伟杰 <[email protected]>
AuthorDate: Mon Aug 1 16:24:02 2022 +0800
Bump testcontainers to 1.17.3 (#19730)
* Bump testcontainers to 1.17.3
* Do IT when pom.xml changed
* Set exposed port in Proxy containers
* Do Scaling and Transaction IT if pom.xml changed
---
.github/workflows/it-scaling.yml | 2 ++
.github/workflows/it-transaction.yml | 1 +
.github/workflows/it.yml | 2 ++
shardingsphere-test/pom.xml | 2 +-
.../atomic/adapter/impl/ShardingSphereProxyClusterContainer.java | 1 +
.../atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java | 1 +
6 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/it-scaling.yml b/.github/workflows/it-scaling.yml
index 4972fa17927..e7e1f1eb215 100644
--- a/.github/workflows/it-scaling.yml
+++ b/.github/workflows/it-scaling.yml
@@ -32,6 +32,7 @@ on:
- '**/src/main/**/data/pipeline/**'
- '**/src/main/resources/META-INF/services/*.data.pipeline.*'
- '!shardingsphere-test/**'
+ - 'shardingsphere-test/**/pom.xml'
- 'shardingsphere-test/shardingsphere-integration-test/**'
-
'!shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/**'
- '!*.md'
@@ -49,6 +50,7 @@ on:
- '**/src/main/**/data/pipeline/**'
- '**/src/main/resources/META-INF/services/*.data.pipeline.*'
- '!shardingsphere-test/**'
+ - 'shardingsphere-test/**/pom.xml'
- 'shardingsphere-test/shardingsphere-integration-test/**'
-
'!shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/**'
- '!*.md'
diff --git a/.github/workflows/it-transaction.yml
b/.github/workflows/it-transaction.yml
index bdb043ae0b4..204b4bb13ff 100644
--- a/.github/workflows/it-transaction.yml
+++ b/.github/workflows/it-transaction.yml
@@ -27,6 +27,7 @@ on:
paths:
- '!examples/**'
- '!shardingsphere-test/**'
+ - 'shardingsphere-test/**/pom.xml'
- 'shardingsphere-test/shardingsphere-integration-test/**'
-
'!shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/**'
-
'!shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/**'
diff --git a/.github/workflows/it.yml b/.github/workflows/it.yml
index 76823a511bc..da125c2a1b2 100644
--- a/.github/workflows/it.yml
+++ b/.github/workflows/it.yml
@@ -30,6 +30,7 @@ on:
-
'!shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/**'
- '!shardingsphere-kernel/shardingsphere-data-pipeline/**'
- '!shardingsphere-test/**'
+ - 'shardingsphere-test/**/pom.xml'
- 'shardingsphere-test/shardingsphere-integration-test/**'
-
'!shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/**'
- 'shardingsphere-test/shardingsphere-integration-agent-test/**'
@@ -46,6 +47,7 @@ on:
-
'!shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/**'
- '!shardingsphere-kernel/shardingsphere-data-pipeline/**'
- '!shardingsphere-test/**'
+ - 'shardingsphere-test/**/pom.xml'
- 'shardingsphere-test/shardingsphere-integration-test/**'
-
'!shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/**'
- 'shardingsphere-test/shardingsphere-integration-agent-test/**'
diff --git a/shardingsphere-test/pom.xml b/shardingsphere-test/pom.xml
index 82b1e7b6dd1..fc90f13eb61 100644
--- a/shardingsphere-test/pom.xml
+++ b/shardingsphere-test/pom.xml
@@ -41,7 +41,7 @@
</modules>
<properties>
- <testcontainers.version>1.15.2</testcontainers.version>
+ <testcontainers.version>1.17.3</testcontainers.version>
</properties>
<dependencyManagement>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
index 0c6e1507355..d878dc129bf 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
@@ -65,6 +65,7 @@ public final class ShardingSphereProxyClusterContainer
extends DockerITContainer
@Override
protected void configure() {
+ withExposedPorts(3307);
mapConfigurationFiles();
setWaitStrategy(new JDBCConnectionWaitStrategy(() ->
DriverManager.getConnection(DataSourceEnvironment.getURL(databaseType,
getHost(), getMappedPort(3307), scenario), "proxy", "Proxy@123")));
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
index dc8bb13c4c2..2660111198a 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
@@ -67,6 +67,7 @@ public final class ShardingSphereProxyStandaloneContainer
extends DockerITContai
@Override
protected void configure() {
+ withExposedPorts(3307);
mapConfigurationFiles();
setWaitStrategy(new JDBCConnectionWaitStrategy(() ->
DriverManager.getConnection(DataSourceEnvironment.getURL(databaseType,
getHost(), getMappedPort(3307), scenario), "root", "Root@123")));
}
