You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by la...@apache.org on 2021/09/26 12:23:48 UTC
[dubbo-go] branch 3.0 updated (1397e8b -> 91ebda2)
This is an automated email from the ASF dual-hosted git repository.
laurence pushed a change to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git.
from 1397e8b Fix: merge config-enhance
add 4314ba8 fix: remove old integrate test
new 91ebda2 fix: integrate test script
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/github-actions.yml | 8 -
Makefile | 11 +-
integrate_test.sh | 36 +-
test/integrate/dubbo/go-client/Dockerfile | 42 --
test/integrate/dubbo/go-client/client.go | 67 ---
test/integrate/dubbo/go-client/client.yml | 59 --
test/integrate/dubbo/go-client/go.mod | 10 -
test/integrate/dubbo/go-client/go.sum | 903 ------------------------------
test/integrate/dubbo/go-client/log.yml | 27 -
test/integrate/dubbo/go-client/user.go | 57 --
test/integrate/dubbo/go-client/version.go | 20 -
test/integrate/dubbo/go-server/Dockerfile | 41 --
test/integrate/dubbo/go-server/go.mod | 14 -
test/integrate/dubbo/go-server/go.sum | 903 ------------------------------
test/integrate/dubbo/go-server/log.yml | 27 -
test/integrate/dubbo/go-server/server.go | 56 --
test/integrate/dubbo/go-server/server.yml | 55 --
test/integrate/dubbo/go-server/user.go | 67 ---
test/integrate/dubbo/go-server/version.go | 20 -
19 files changed, 8 insertions(+), 2415 deletions(-)
delete mode 100644 test/integrate/dubbo/go-client/Dockerfile
delete mode 100644 test/integrate/dubbo/go-client/client.go
delete mode 100644 test/integrate/dubbo/go-client/client.yml
delete mode 100644 test/integrate/dubbo/go-client/go.mod
delete mode 100644 test/integrate/dubbo/go-client/go.sum
delete mode 100644 test/integrate/dubbo/go-client/log.yml
delete mode 100644 test/integrate/dubbo/go-client/user.go
delete mode 100644 test/integrate/dubbo/go-client/version.go
delete mode 100644 test/integrate/dubbo/go-server/Dockerfile
delete mode 100644 test/integrate/dubbo/go-server/go.mod
delete mode 100644 test/integrate/dubbo/go-server/go.sum
delete mode 100644 test/integrate/dubbo/go-server/log.yml
delete mode 100644 test/integrate/dubbo/go-server/server.go
delete mode 100644 test/integrate/dubbo/go-server/server.yml
delete mode 100644 test/integrate/dubbo/go-server/user.go
delete mode 100644 test/integrate/dubbo/go-server/version.go
[dubbo-go] 01/01: fix: integrate test script
Posted by la...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
laurence pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
commit 91ebda2e80d403733a7d19cbba6936512b2d3897
Author: LaurenceLiZhixin <38...@qq.com>
AuthorDate: Sun Sep 26 20:23:11 2021 +0800
fix: integrate test script
---
integrate_test.sh | 36 ++++++------------------------------
1 file changed, 6 insertions(+), 30 deletions(-)
diff --git a/integrate_test.sh b/integrate_test.sh
index b12c653..e2684ff 100644
--- a/integrate_test.sh
+++ b/integrate_test.sh
@@ -35,35 +35,11 @@ echo "github pull request repo param -> $1"
echo "github pull request base branch -> $3"
echo "github pull request head branch -> ${GITHUB_HEAD_REF}"
-samples_testing() {
- echo "use dubbo-go-samples $3 branch for integration testing"
- git clone -b master https://github.com/apache/dubbo-go-samples.git samples && cd samples
+echo "use dubbo-go-samples $3 branch for integration testing"
+git clone -b master https://github.com/apache/dubbo-go-samples.git samples && cd samples
- # update dubbo-go to current commit id
- go mod edit -replace=dubbo.apache.org/dubbo-go/v3=github.com/"$1"/v3@"$2"
+# update dubbo-go to current commit id
+go mod edit -replace=dubbo.apache.org/dubbo-go/v3=github.com/"$1"/v3@"$2"
- # start integrate test
- ./start_integrate_test.sh
-}
-
-local_testing() {
- echo "use test/integrate/dubbo for integration testing"
- # default use zk as registry
- #start zookeeper registry insecure listen in [:]:2181
- docker run -d --network host zookeeper
- echo "zookeeper listen in [:]2181"
-
- # build go-server image
- cd ./test/integrate/dubbo/go-server
- docker build . -t ci-provider --build-arg REPO="$1" --build-arg COMMITID="$2"
- cd "${ROOT_DIR}"
- docker run -d --network host ci-provider
-}
-
-# check dubbo-go-samples corresponding branch
-res=$(git ls-remote --heads https://github.com/apache/dubbo-go-samples.git "$3" | wc -l)
-if [ "$res" -eq "1" ]; then
- samples_testing "$@"
-else
- local_testing "$@"
-fi
+# start integrate test
+./start_integrate_test.sh