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 81011a4e Reset e2e back to main repo, fix the e2e settings (#345)
81011a4e is described below
commit 81011a4e3c1f4e181f87a4d561eeab190bdf5af2
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Wed Oct 18 15:48:00 2023 +0800
Reset e2e back to main repo, fix the e2e settings (#345)
---
.github/workflows/e2e.storage.yml | 4 ++--
test/docker/base-compose.yml | 12 ++++--------
test/e2e-v2/cases/cluster/docker-compose.yml | 4 ++--
test/e2e-v2/script/env | 2 +-
test/stress/env | 2 +-
test/stress/env.dev | 2 +-
6 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/e2e.storage.yml
b/.github/workflows/e2e.storage.yml
index 8f35d6d0..35428b9c 100644
--- a/.github/workflows/e2e.storage.yml
+++ b/.github/workflows/e2e.storage.yml
@@ -93,7 +93,7 @@ jobs:
make docker || make docker
docker image ls
- name: ${{ matrix.test.name }}
- uses:
apache/skywalking-infra-e2e@964ede199fe199e166920169dc5f8c9b214cfac5
+ uses:
apache/skywalking-infra-e2e@c7494f913e0b10d01884c840ec3fb1b0a844bcbe
with:
e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
@@ -104,4 +104,4 @@ jobs:
needs: [StoragePlugins]
steps:
- name: To pass or not pass
- run: echo "Just to make the GitHub merge button green"
\ No newline at end of file
+ run: echo "Just to make the GitHub merge button green"
diff --git a/test/docker/base-compose.yml b/test/docker/base-compose.yml
index 44a9bd47..da8159f7 100644
--- a/test/docker/base-compose.yml
+++ b/test/docker/base-compose.yml
@@ -54,18 +54,14 @@ services:
- sw_agent:/skywalking-java-agent
oap:
- image:
"ghcr.io/apache/skywalking-banyandb-java-client/oap:${SW_OAP_COMMIT}"
+ image: "ghcr.io/apache/skywalking/oap:${SW_OAP_COMMIT}"
expose:
- 11800
- 12800
- 10051
- 5005
environment:
- SW_CLUSTER_ZK_HOST_PORT: zk:2181
- SW_STORAGE_ES_CLUSTER_NODES: es:9200
- SW_JDBC_URL: jdbc:mysql://mysql:3306/swtest
- SW_STORAGE_INFLUXDB_URL: http://influxdb:8086
- SW_STORAGE_BANYANDB_HOST: "banyandb"
+ SW_STORAGE_BANYANDB_TARGETS: banyandb:17912
SW_CONFIG_ETCD_PERIOD: 1
SW_CONFIG_ETCD_ENDPOINTS: http://etcd:2379
SW_CLUSTER_ETCD_ENDPOINTS: http://etcd:2379
@@ -76,7 +72,7 @@ services:
retries: 120
ui:
- image: "ghcr.io/apache/skywalking-banyandb-java-client/ui:${SW_OAP_COMMIT}"
+ image: "ghcr.io/apache/skywalking/ui:${SW_OAP_COMMIT}"
expose:
- 8080
environment:
@@ -143,4 +139,4 @@ services:
start_period: 40s
volumes:
- sw_agent:
\ No newline at end of file
+ sw_agent:
diff --git a/test/e2e-v2/cases/cluster/docker-compose.yml
b/test/e2e-v2/cases/cluster/docker-compose.yml
index 87956813..64bb2e5d 100644
--- a/test/e2e-v2/cases/cluster/docker-compose.yml
+++ b/test/e2e-v2/cases/cluster/docker-compose.yml
@@ -43,7 +43,7 @@ services:
service: oap
environment:
SW_STORAGE: banyandb
- SW_STORAGE_BANYANDB_HOST: "liaison"
+ SW_STORAGE_BANYANDB_TARGETS: "liaison:17912"
ports:
- 12800
depends_on:
@@ -89,4 +89,4 @@ networks:
e2e:
volumes:
- sw_agent:
\ No newline at end of file
+ sw_agent:
diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env
index c1d3d0a0..c7744d4c 100644
--- a/test/e2e-v2/script/env
+++ b/test/e2e-v2/script/env
@@ -25,5 +25,5 @@
SW_KUBERNETES_COMMIT_SHA=e2c61c6774cf377b23516fca6f8a1e119d3191c5
SW_ROVER_COMMIT=fc8d074c6d34ecfee585a7097cbd5aef1ca680a5
SW_CTL_COMMIT=6b2eb0011e38b630db6af7203db215806bd141ed
-SW_OAP_COMMIT=bb830ee6d3c992aca128eeaf2f8841d2776faf2e
+SW_OAP_COMMIT=e5c308d4358d5b02a658b8ad7f153aec99b8e63a
SW_AGENT_E2E_SERVICE_PROVIDER_COMMIT=cc7a2c9e97fd2c421adbe3e9c471688459a446d9
diff --git a/test/stress/env b/test/stress/env
index 91076f83..4d2c788b 100644
--- a/test/stress/env
+++ b/test/stress/env
@@ -26,7 +26,7 @@
SW_KUBERNETES_COMMIT_SHA=b670c41d94a82ddefcf466d54bab5c492d88d772
SW_ROVER_COMMIT=d956eaede57b62108b78bca48045bd09ba88e653
SW_CTL_COMMIT=e684fae0107045fc23799146d62f04cb68bd5a3b
-SW_OAP_COMMIT=bb830ee6d3c992aca128eeaf2f8841d2776faf2e
+SW_OAP_COMMIT=e5c308d4358d5b02a658b8ad7f153aec99b8e63a
SW_AGENT_E2E_SERVICE_PROVIDER_COMMIT=828e6e2f2b57a0f06bb0d507e3296d2377943d9a
TARGET=test
diff --git a/test/stress/env.dev b/test/stress/env.dev
index febe0637..ab0e16cc 100644
--- a/test/stress/env.dev
+++ b/test/stress/env.dev
@@ -25,7 +25,7 @@
SW_KUBERNETES_COMMIT_SHA=b670c41d94a82ddefcf466d54bab5c492d88d772
SW_ROVER_COMMIT=d956eaede57b62108b78bca48045bd09ba88e653
SW_CTL_COMMIT=e684fae0107045fc23799146d62f04cb68bd5a3b
-SW_OAP_COMMIT=bb830ee6d3c992aca128eeaf2f8841d2776faf2e
+SW_OAP_COMMIT=e5c308d4358d5b02a658b8ad7f153aec99b8e63a
SW_AGENT_E2E_SERVICE_PROVIDER_COMMIT=828e6e2f2b57a0f06bb0d507e3296d2377943d9a
TARGET=dev
