This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git
The following commit(s) were added to refs/heads/main by this push:
new 168dcaeaa Adding both etcd and property schema test in each E2E (#994)
168dcaeaa is described below
commit 168dcaeaaac564ec0a24672dd1e0882c52603409
Author: mrproliu <[email protected]>
AuthorDate: Mon Mar 9 16:13:23 2026 +0800
Adding both etcd and property schema test in each E2E (#994)
---
.github/workflows/e2e.yml | 24 ++++++++++++++--------
test/docker/base-compose.yml | 6 +++---
...{docker-compose.yml => docker-compose-etcd.yml} | 2 ++
...ker-compose.yml => docker-compose-property.yml} | 2 ++
.../cases/cluster/{e2e.yaml => e2e-etcd.yaml} | 2 +-
.../cases/cluster/{e2e.yaml => e2e-property.yaml} | 2 +-
...{docker-compose.yml => docker-compose-etcd.yml} | 1 +
...ker-compose.yml => docker-compose-property.yml} | 1 +
.../event/banyandb/{e2e.yaml => e2e-etcd.yaml} | 2 +-
.../event/banyandb/{e2e.yaml => e2e-property.yaml} | 2 +-
...{docker-compose.yml => docker-compose-etcd.yml} | 3 ++-
...ker-compose.yml => docker-compose-property.yml} | 3 ++-
.../trace/banyandb/{e2e.yaml => e2e-etcd.yaml} | 2 +-
.../trace/banyandb/{e2e.yaml => e2e-property.yaml} | 2 +-
...{docker-compose.yml => docker-compose-etcd.yml} | 3 ++-
...ker-compose.yml => docker-compose-property.yml} | 3 ++-
.../storage/banyandb/{e2e.yaml => e2e-etcd.yaml} | 4 ++--
.../banyandb/{e2e.yaml => e2e-property.yaml} | 4 ++--
18 files changed, 43 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 60825a5e5..1cd095503 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -56,14 +56,22 @@ jobs:
fail-fast: false
matrix:
test:
- - name: BanyanDB
- config: test/e2e-v2/cases/storage/banyandb/e2e.yaml
- - name: Trace Profiling BanyanDB
- config: test/e2e-v2/cases/profiling/trace/banyandb/e2e.yaml
- - name: Event BanyanDB
- config: test/e2e-v2/cases/event/banyandb/e2e.yaml
- - name: BanyanDB Cluster Mode
- config: test/e2e-v2/cases/cluster/e2e.yaml
+ - name: BanyanDB Etcd
+ config: test/e2e-v2/cases/storage/banyandb/e2e-etcd.yaml
+ - name: BanyanDB Property
+ config: test/e2e-v2/cases/storage/banyandb/e2e-property.yaml
+ - name: Trace Profiling BanyanDB Etcd
+ config: test/e2e-v2/cases/profiling/trace/banyandb/e2e-etcd.yaml
+ - name: Trace Profiling BanyanDB Property
+ config:
test/e2e-v2/cases/profiling/trace/banyandb/e2e-property.yaml
+ - name: Event BanyanDB Etcd
+ config: test/e2e-v2/cases/event/banyandb/e2e-etcd.yaml
+ - name: Event BanyanDB Property
+ config: test/e2e-v2/cases/event/banyandb/e2e-property.yaml
+ - name: BanyanDB Cluster Mode Etcd
+ config: test/e2e-v2/cases/cluster/e2e-etcd.yaml
+ - name: BanyanDB Cluster Mode Property
+ config: test/e2e-v2/cases/cluster/e2e-property.yaml
# TODO: Enable Lifecycle test when it is ready
# - name: Lifecycle
# config: test/e2e-v2/cases/lifecycle/e2e.yaml
diff --git a/test/docker/base-compose.yml b/test/docker/base-compose.yml
index bd9977da0..d583fc0ff 100644
--- a/test/docker/base-compose.yml
+++ b/test/docker/base-compose.yml
@@ -19,7 +19,7 @@ services:
- 17912
- 2121
- 6060
- command: standalone --schema-registry-mode=etcd
+ command: standalone
healthcheck:
test: ["CMD", "./bydbctl", "health", "--config=-",
"--addr=http://banyandb:17913";]
interval: 5s
@@ -34,7 +34,7 @@ services:
- 17912
- 2121
- 6060
- command: liaison --etcd-endpoints=http://etcd:2379
--schema-registry-mode=etcd
+ command: liaison --etcd-endpoints=http://etcd:2379
healthcheck:
test: ["CMD", "./bydbctl", "health", "--addr=http://liaison:17913";]
interval: 5s
@@ -48,7 +48,7 @@ services:
- 2121
- 6060
- 17932
- command: data --etcd-endpoints=http://etcd:2379 --schema-registry-mode=etcd
+ command: data --etcd-endpoints=http://etcd:2379
healthcheck:
test: ["CMD", "./bydbctl", "health", "--addr=http://127.0.0.1:17913";]
interval: 5s
diff --git a/test/e2e-v2/cases/cluster/docker-compose.yml
b/test/e2e-v2/cases/cluster/docker-compose-etcd.yml
similarity index 93%
copy from test/e2e-v2/cases/cluster/docker-compose.yml
copy to test/e2e-v2/cases/cluster/docker-compose-etcd.yml
index 64bb2e5d6..503b91fc0 100644
--- a/test/e2e-v2/cases/cluster/docker-compose.yml
+++ b/test/e2e-v2/cases/cluster/docker-compose-etcd.yml
@@ -27,6 +27,7 @@ services:
extends:
file: ../../script/docker-compose/base-compose.yml
service: data
+ command: data --etcd-endpoints=http://etcd:2379 --schema-registry-mode=etcd
networks:
- e2e
@@ -34,6 +35,7 @@ services:
extends:
file: ../../script/docker-compose/base-compose.yml
service: liaison
+ command: liaison --etcd-endpoints=http://etcd:2379
--schema-registry-mode=etcd
networks:
- e2e
diff --git a/test/e2e-v2/cases/cluster/docker-compose.yml
b/test/e2e-v2/cases/cluster/docker-compose-property.yml
similarity index 89%
rename from test/e2e-v2/cases/cluster/docker-compose.yml
rename to test/e2e-v2/cases/cluster/docker-compose-property.yml
index 64bb2e5d6..6d390b226 100644
--- a/test/e2e-v2/cases/cluster/docker-compose.yml
+++ b/test/e2e-v2/cases/cluster/docker-compose-property.yml
@@ -27,6 +27,7 @@ services:
extends:
file: ../../script/docker-compose/base-compose.yml
service: data
+ command: data --etcd-endpoints=http://etcd:2379
--schema-registry-mode=property --schema-property-client-sync-interval=10s
networks:
- e2e
@@ -34,6 +35,7 @@ services:
extends:
file: ../../script/docker-compose/base-compose.yml
service: liaison
+ command: liaison --etcd-endpoints=http://etcd:2379
--schema-registry-mode=property --schema-property-client-sync-interval=10s
networks:
- e2e
diff --git a/test/e2e-v2/cases/cluster/e2e.yaml
b/test/e2e-v2/cases/cluster/e2e-etcd.yaml
similarity index 98%
copy from test/e2e-v2/cases/cluster/e2e.yaml
copy to test/e2e-v2/cases/cluster/e2e-etcd.yaml
index f3e3cd44a..9cc96f83f 100644
--- a/test/e2e-v2/cases/cluster/e2e.yaml
+++ b/test/e2e-v2/cases/cluster/e2e-etcd.yaml
@@ -17,7 +17,7 @@
setup:
env: compose
- file: docker-compose.yml
+ file: docker-compose-etcd.yml
timeout: 20m
init-system-environment: ../../script/env
steps:
diff --git a/test/e2e-v2/cases/cluster/e2e.yaml
b/test/e2e-v2/cases/cluster/e2e-property.yaml
similarity index 97%
rename from test/e2e-v2/cases/cluster/e2e.yaml
rename to test/e2e-v2/cases/cluster/e2e-property.yaml
index f3e3cd44a..ac234b896 100644
--- a/test/e2e-v2/cases/cluster/e2e.yaml
+++ b/test/e2e-v2/cases/cluster/e2e-property.yaml
@@ -17,7 +17,7 @@
setup:
env: compose
- file: docker-compose.yml
+ file: docker-compose-property.yml
timeout: 20m
init-system-environment: ../../script/env
steps:
diff --git a/test/e2e-v2/cases/event/banyandb/docker-compose.yml
b/test/e2e-v2/cases/event/banyandb/docker-compose-etcd.yml
similarity index 95%
copy from test/e2e-v2/cases/event/banyandb/docker-compose.yml
copy to test/e2e-v2/cases/event/banyandb/docker-compose-etcd.yml
index aa3bb4212..7754d99ce 100644
--- a/test/e2e-v2/cases/event/banyandb/docker-compose.yml
+++ b/test/e2e-v2/cases/event/banyandb/docker-compose-etcd.yml
@@ -18,6 +18,7 @@ services:
extends:
file: ../../../script/docker-compose/base-compose.yml
service: banyandb
+ command: standalone --schema-registry-mode=etcd
networks:
- e2e
diff --git a/test/e2e-v2/cases/event/banyandb/docker-compose.yml
b/test/e2e-v2/cases/event/banyandb/docker-compose-property.yml
similarity index 92%
rename from test/e2e-v2/cases/event/banyandb/docker-compose.yml
rename to test/e2e-v2/cases/event/banyandb/docker-compose-property.yml
index aa3bb4212..dfaacc9d8 100644
--- a/test/e2e-v2/cases/event/banyandb/docker-compose.yml
+++ b/test/e2e-v2/cases/event/banyandb/docker-compose-property.yml
@@ -18,6 +18,7 @@ services:
extends:
file: ../../../script/docker-compose/base-compose.yml
service: banyandb
+ command: standalone --schema-registry-mode=property
--schema-property-client-sync-interval=10s
networks:
- e2e
diff --git a/test/e2e-v2/cases/event/banyandb/e2e.yaml
b/test/e2e-v2/cases/event/banyandb/e2e-etcd.yaml
similarity index 97%
copy from test/e2e-v2/cases/event/banyandb/e2e.yaml
copy to test/e2e-v2/cases/event/banyandb/e2e-etcd.yaml
index c957da231..c44fae9db 100644
--- a/test/e2e-v2/cases/event/banyandb/e2e.yaml
+++ b/test/e2e-v2/cases/event/banyandb/e2e-etcd.yaml
@@ -17,7 +17,7 @@
setup:
env: compose
- file: docker-compose.yml
+ file: docker-compose-etcd.yml
timeout: 20m
init-system-environment: ../../../script/env
steps:
diff --git a/test/e2e-v2/cases/event/banyandb/e2e.yaml
b/test/e2e-v2/cases/event/banyandb/e2e-property.yaml
similarity index 97%
rename from test/e2e-v2/cases/event/banyandb/e2e.yaml
rename to test/e2e-v2/cases/event/banyandb/e2e-property.yaml
index c957da231..979c98911 100644
--- a/test/e2e-v2/cases/event/banyandb/e2e.yaml
+++ b/test/e2e-v2/cases/event/banyandb/e2e-property.yaml
@@ -17,7 +17,7 @@
setup:
env: compose
- file: docker-compose.yml
+ file: docker-compose-property.yml
timeout: 20m
init-system-environment: ../../../script/env
steps:
diff --git a/test/e2e-v2/cases/profiling/trace/banyandb/docker-compose.yml
b/test/e2e-v2/cases/profiling/trace/banyandb/docker-compose-etcd.yml
similarity index 96%
copy from test/e2e-v2/cases/profiling/trace/banyandb/docker-compose.yml
copy to test/e2e-v2/cases/profiling/trace/banyandb/docker-compose-etcd.yml
index d4eb94bb6..64358661a 100644
--- a/test/e2e-v2/cases/profiling/trace/banyandb/docker-compose.yml
+++ b/test/e2e-v2/cases/profiling/trace/banyandb/docker-compose-etcd.yml
@@ -20,6 +20,7 @@ services:
extends:
file: ../../../../script/docker-compose/base-compose.yml
service: banyandb
+ command: standalone --schema-registry-mode=etcd
networks:
- e2e
@@ -60,4 +61,4 @@ networks:
e2e:
volumes:
- sw_agent:
\ No newline at end of file
+ sw_agent:
diff --git a/test/e2e-v2/cases/profiling/trace/banyandb/docker-compose.yml
b/test/e2e-v2/cases/profiling/trace/banyandb/docker-compose-property.yml
similarity index 93%
rename from test/e2e-v2/cases/profiling/trace/banyandb/docker-compose.yml
rename to test/e2e-v2/cases/profiling/trace/banyandb/docker-compose-property.yml
index d4eb94bb6..3844c1405 100644
--- a/test/e2e-v2/cases/profiling/trace/banyandb/docker-compose.yml
+++ b/test/e2e-v2/cases/profiling/trace/banyandb/docker-compose-property.yml
@@ -20,6 +20,7 @@ services:
extends:
file: ../../../../script/docker-compose/base-compose.yml
service: banyandb
+ command: standalone --schema-registry-mode=property
--schema-property-client-sync-interval=10s
networks:
- e2e
@@ -60,4 +61,4 @@ networks:
e2e:
volumes:
- sw_agent:
\ No newline at end of file
+ sw_agent:
diff --git a/test/e2e-v2/cases/profiling/trace/banyandb/e2e.yaml
b/test/e2e-v2/cases/profiling/trace/banyandb/e2e-etcd.yaml
similarity index 97%
copy from test/e2e-v2/cases/profiling/trace/banyandb/e2e.yaml
copy to test/e2e-v2/cases/profiling/trace/banyandb/e2e-etcd.yaml
index 8a4fdf3a3..32ab481a9 100644
--- a/test/e2e-v2/cases/profiling/trace/banyandb/e2e.yaml
+++ b/test/e2e-v2/cases/profiling/trace/banyandb/e2e-etcd.yaml
@@ -17,7 +17,7 @@
setup:
env: compose
- file: docker-compose.yml
+ file: docker-compose-etcd.yml
timeout: 20m
init-system-environment: ../../../../script/env
steps:
diff --git a/test/e2e-v2/cases/profiling/trace/banyandb/e2e.yaml
b/test/e2e-v2/cases/profiling/trace/banyandb/e2e-property.yaml
similarity index 97%
rename from test/e2e-v2/cases/profiling/trace/banyandb/e2e.yaml
rename to test/e2e-v2/cases/profiling/trace/banyandb/e2e-property.yaml
index 8a4fdf3a3..b92258adf 100644
--- a/test/e2e-v2/cases/profiling/trace/banyandb/e2e.yaml
+++ b/test/e2e-v2/cases/profiling/trace/banyandb/e2e-property.yaml
@@ -17,7 +17,7 @@
setup:
env: compose
- file: docker-compose.yml
+ file: docker-compose-property.yml
timeout: 20m
init-system-environment: ../../../../script/env
steps:
diff --git a/test/e2e-v2/cases/storage/banyandb/docker-compose.yml
b/test/e2e-v2/cases/storage/banyandb/docker-compose-etcd.yml
similarity index 96%
copy from test/e2e-v2/cases/storage/banyandb/docker-compose.yml
copy to test/e2e-v2/cases/storage/banyandb/docker-compose-etcd.yml
index 37ee56449..81feb8022 100644
--- a/test/e2e-v2/cases/storage/banyandb/docker-compose.yml
+++ b/test/e2e-v2/cases/storage/banyandb/docker-compose-etcd.yml
@@ -20,6 +20,7 @@ services:
extends:
file: ../../../script/docker-compose/base-compose.yml
service: banyandb
+ command: standalone --schema-registry-mode=etcd
networks:
- e2e
@@ -74,4 +75,4 @@ networks:
e2e:
volumes:
- sw_agent:
\ No newline at end of file
+ sw_agent:
diff --git a/test/e2e-v2/cases/storage/banyandb/docker-compose.yml
b/test/e2e-v2/cases/storage/banyandb/docker-compose-property.yml
similarity index 94%
rename from test/e2e-v2/cases/storage/banyandb/docker-compose.yml
rename to test/e2e-v2/cases/storage/banyandb/docker-compose-property.yml
index 37ee56449..00f811d30 100644
--- a/test/e2e-v2/cases/storage/banyandb/docker-compose.yml
+++ b/test/e2e-v2/cases/storage/banyandb/docker-compose-property.yml
@@ -20,6 +20,7 @@ services:
extends:
file: ../../../script/docker-compose/base-compose.yml
service: banyandb
+ command: standalone --schema-registry-mode=property
--schema-property-client-sync-interval=10s
networks:
- e2e
@@ -74,4 +75,4 @@ networks:
e2e:
volumes:
- sw_agent:
\ No newline at end of file
+ sw_agent:
diff --git a/test/e2e-v2/cases/storage/banyandb/e2e.yaml
b/test/e2e-v2/cases/storage/banyandb/e2e-etcd.yaml
similarity index 96%
copy from test/e2e-v2/cases/storage/banyandb/e2e.yaml
copy to test/e2e-v2/cases/storage/banyandb/e2e-etcd.yaml
index 70714eef4..2b3c65806 100644
--- a/test/e2e-v2/cases/storage/banyandb/e2e.yaml
+++ b/test/e2e-v2/cases/storage/banyandb/e2e-etcd.yaml
@@ -17,7 +17,7 @@
setup:
env: compose
- file: docker-compose.yml
+ file: docker-compose-etcd.yml
timeout: 20m
init-system-environment: ../../../script/env
steps:
@@ -47,4 +47,4 @@ verify:
interval: 10s
cases:
- includes:
- - ../storage-cases.yaml
\ No newline at end of file
+ - ../storage-cases.yaml
diff --git a/test/e2e-v2/cases/storage/banyandb/e2e.yaml
b/test/e2e-v2/cases/storage/banyandb/e2e-property.yaml
similarity index 96%
rename from test/e2e-v2/cases/storage/banyandb/e2e.yaml
rename to test/e2e-v2/cases/storage/banyandb/e2e-property.yaml
index 70714eef4..ec682c7cf 100644
--- a/test/e2e-v2/cases/storage/banyandb/e2e.yaml
+++ b/test/e2e-v2/cases/storage/banyandb/e2e-property.yaml
@@ -17,7 +17,7 @@
setup:
env: compose
- file: docker-compose.yml
+ file: docker-compose-property.yml
timeout: 20m
init-system-environment: ../../../script/env
steps:
@@ -47,4 +47,4 @@ verify:
interval: 10s
cases:
- includes:
- - ../storage-cases.yaml
\ No newline at end of file
+ - ../storage-cases.yaml
