This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 8c0c557681b Unify openGauss image for E2E test (#36673)
8c0c557681b is described below
commit 8c0c557681beb6e0dbbb79eea795b8685b69e957
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue Sep 23 20:05:41 2025 +0800
Unify openGauss image for E2E test (#36673)
* Refactor database-encrypt.yaml
* Unify openGauss image for E2E test
---
.github/workflows/nightly-e2e-operation.yml | 5 ++---
.../e2e/operation/pipeline/src/test/resources/env/e2e-env.properties | 2 +-
.../operation/transaction/src/test/resources/env/e2e-env.properties | 2 +-
test/e2e/sql/src/test/resources/env/e2e-env.properties | 4 ++--
.../env/scenario/encrypt/proxy/conf/mysql/database-encrypt.yaml | 2 +-
.../env/scenario/encrypt/proxy/conf/opengauss/database-encrypt.yaml | 2 +-
.../env/scenario/encrypt/proxy/conf/postgresql/database-encrypt.yaml | 2 +-
7 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/nightly-e2e-operation.yml
b/.github/workflows/nightly-e2e-operation.yml
index faa4ee98cf7..a4466d0ab6a 100644
--- a/.github/workflows/nightly-e2e-operation.yml
+++ b/.github/workflows/nightly-e2e-operation.yml
@@ -54,8 +54,7 @@ jobs:
{ type: "e2e.docker.postgresql.version", version:
"postgres:12-alpine" },
{ type: "e2e.docker.postgresql.version", version:
"postgres:13-alpine" },
{ type: "e2e.docker.postgresql.version", version:
"postgres:14-alpine" },
- { type: "e2e.docker.opengauss.version", version:
"enmotech/opengauss:2.1.0" },
- { type: "e2e.docker.opengauss.version", version:
"enmotech/opengauss:3.0.0" }
+ { type: "e2e.docker.opengauss.version", version:
"opengauss/opengauss:3.1.0" }
]
exclude:
- operation: transaction
@@ -65,7 +64,7 @@ jobs:
- operation: showprocesslist
image: { type: "e2e.docker.postgresql.version", version:
"postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine"
}
- operation: showprocesslist
- image: { type: "e2e.docker.opengauss.version", version:
"enmotech/opengauss:2.1.0,enmotech/opengauss:3.0.0" }
+ image: { type: "e2e.docker.opengauss.version", version:
"opengauss/opengauss:3.1.0" }
steps:
- uses: actions/checkout@v4
- name: Retrieve Maven Caches
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/e2e-env.properties
b/test/e2e/operation/pipeline/src/test/resources/env/e2e-env.properties
index bbec2e9b060..709c901544d 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/operation/pipeline/src/test/resources/env/e2e-env.properties
@@ -21,7 +21,7 @@ pipeline.e2e.env.type=NONE
pipeline.e2e.docker.mysql.version=
#
pipeline.e2e.docker.postgresql.version=postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine
pipeline.e2e.docker.postgresql.version=
-#
pipeline.e2e.docker.opengauss.version=enmotech/opengauss:3.0.0,enmotech/opengauss:2.1.0
+# pipeline.e2e.docker.opengauss.version=opengauss/opengauss:3.1.0
pipeline.e2e.docker.opengauss.version=
# pipeline.e2e.native.database=mysql or postgresql or opengauss
pipeline.e2e.native.database=
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
b/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
index 4e29b155060..1f277145515 100644
--- a/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
@@ -27,7 +27,7 @@ transaction.e2e.env.xa.providers=Atomikos, Narayana
transaction.e2e.docker.mysql.version=
#
transaction.e2e.docker.postgresql.version=postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine
transaction.e2e.docker.postgresql.version=
-#
transaction.e2e.docker.opengauss.version=enmotech/opengauss:3.0.0,enmotech/opengauss:2.1.0
+# transaction.e2e.docker.opengauss.version=opengauss/opengauss:3.1.0
transaction.e2e.docker.opengauss.version=
e2e.native.storage.host=127.0.0.1
diff --git a/test/e2e/sql/src/test/resources/env/e2e-env.properties
b/test/e2e/sql/src/test/resources/env/e2e-env.properties
index be5df4accc2..a72b8972921 100644
--- a/test/e2e/sql/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/sql/src/test/resources/env/e2e-env.properties
@@ -16,7 +16,7 @@
#
#e2e.scenarios=db,tbl,readwrite_splitting,encrypt,shadow,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,distsql_rdl,empty_rules,sharding_and_encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,readwrite_splitting_and_shadow,sharding_and_shadow,sharding_encrypt_shadow,mask,mask_encrypt,mask_sharding,mask_encrypt_sharding,db_tbl_sql_federation
-e2e.scenarios=db,tbl,readwrite_splitting,encrypt,shadow,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,distsql_rdl,empty_rules,sharding_and_encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,readwrite_splitting_and_shadow,sharding_and_shadow,sharding_encrypt_shadow,mask,mask_encrypt,mask_sharding,mask_encrypt_sharding,db_tbl_sql_federation
+e2e.scenarios=dbtbl_with_readwrite_splitting_and_encrypt
e2e.run.additional.cases=false
e2e.run.smoke.cases=false
@@ -25,7 +25,7 @@ e2e.run.smoke.cases=false
e2e.run.type=DOCKER
#e2e.artifact.modes=Standalone,Cluster
-e2e.artifact.modes=
+e2e.artifact.modes=Cluster
# e2e.artifact.adapters=jdbc,proxy
e2e.artifact.adapters=proxy
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/database-encrypt.yaml
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/database-encrypt.yaml
index cbb79cb2aea..768e0dda8b0 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/database-encrypt.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/database-encrypt.yaml
@@ -25,7 +25,7 @@ dataSources:
connectionTimeoutMilliseconds: 30000
idleTimeoutMilliseconds: 60000
maxLifetimeMilliseconds: 1800000
- maxPoolSize: 2
+ maxPoolSize: 5
minPoolSize: 2
rules:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/opengauss/database-encrypt.yaml
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/opengauss/database-encrypt.yaml
index 91a3d2064ff..02486176ab0 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/opengauss/database-encrypt.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/opengauss/database-encrypt.yaml
@@ -25,7 +25,7 @@ dataSources:
connectionTimeoutMilliseconds: 30000
idleTimeoutMilliseconds: 60000
maxLifetimeMilliseconds: 1800000
- maxPoolSize: 2
+ maxPoolSize: 5
minPoolSize: 2
rules:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/database-encrypt.yaml
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/database-encrypt.yaml
index 24128353791..803f2c0b1c1 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/database-encrypt.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/database-encrypt.yaml
@@ -25,7 +25,7 @@ dataSources:
connectionTimeoutMilliseconds: 30000
idleTimeoutMilliseconds: 60000
maxLifetimeMilliseconds: 1800000
- maxPoolSize: 2
+ maxPoolSize: 5
minPoolSize: 2
rules:
