This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 7007b19 Refactor integration test for motan plugin (#2191)
7007b19 is described below
commit 7007b191f69c6c064fb5862df4874b991088fa83
Author: Kunshuai Zhu <[email protected]>
AuthorDate: Thu Oct 7 22:04:27 2021 -0500
Refactor integration test for motan plugin (#2191)
---
.../shenyu-integrated-test-motan/docker-compose.yml | 6 +-----
.../src/main/resources/admin-config/schema.sql | 20 --------------------
2 files changed, 1 insertion(+), 25 deletions(-)
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-motan/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-motan/docker-compose.yml
index 4fd1dab..7371b24 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-motan/docker-compose.yml
+++ b/shenyu-integrated-test/shenyu-integrated-test-motan/docker-compose.yml
@@ -36,10 +36,6 @@ services:
restart: always
networks:
- shenyu
- volumes:
- - type: bind
- source: ./src/main/resources/admin-config/
- target: /opt/sql/
depends_on:
- shenyu-redis
- shenyu-zk
@@ -47,7 +43,7 @@ services:
- 9095:9095
environment:
- SPRING_PROFILES_ACTIVE=h2
- -
"shenyu.database.init_script=sql-script/h2/schema.sql;file:/opt/sql/schema.sql"
+ - "shenyu.database.init_script=sql-script/h2/schema.sql"
healthcheck:
test: [ "CMD-SHELL", "wget -q -O -
http://shenyu-admin:9095/actuator/health | grep UP || exit 1" ]
timeout: 2s
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-motan/src/main/resources/admin-config/schema.sql
b/shenyu-integrated-test/shenyu-integrated-test-motan/src/main/resources/admin-config/schema.sql
deleted file mode 100644
index 898650b..0000000
---
a/shenyu-integrated-test/shenyu-integrated-test-motan/src/main/resources/admin-config/schema.sql
+++ /dev/null
@@ -1,20 +0,0 @@
--- noinspection SqlNoDataSourceInspectionForFile
-
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-
-/** prepare motan **/
-UPDATE `plugin` SET enabled = 1, config = '{"register":"shenyu-zk:2181"}'
WHERE id = '17';
\ No newline at end of file
