Skip to content
Snippets Groups Projects
Unverified Commit f146507f authored by 邹毅贤's avatar 邹毅贤 Committed by GitHub
Browse files

Revert "Fix: integration testing problems"

parent 837f41f3
No related branches found
No related tags found
No related merge requests found
......@@ -52,16 +52,12 @@ docker run -d --network host zookeeper
echo "zookeeper listen in [:]2181"
# build go-server image
# copy main go.mod to test dir
cp go.mod ./test/integrate/dubbo/go-server/go.main.mod
cd ./test/integrate/dubbo/go-server
docker build . -t ci-provider --build-arg PR_ORIGIN_REPO=${TRAVIS_PULL_REQUEST_SLUG} --build-arg PR_ORIGIN_COMMITID=${TRAVIS_PULL_REQUEST_SHA}
cd ${ROOT_DIR}
docker run -d --network host ci-provider
# build go-client image
# copy main go.mod to test dir
cp go.mod ./test/integrate/dubbo/go-client/go.main.mod
cd ./test/integrate/dubbo/go-client
docker build . -t ci-consumer --build-arg PR_ORIGIN_REPO=${TRAVIS_PULL_REQUEST_SLUG} --build-arg PR_ORIGIN_COMMITID=${TRAVIS_PULL_REQUEST_SHA}
cd ${ROOT_DIR}
......
......@@ -29,9 +29,7 @@ ADD . /go/src/github.com/apache/dubbo-go/test/integrate/dubbo/go-client
# update dubbo-go to current commit id
RUN test ${PR_ORIGIN_REPO} && echo "github.com/apache/dubbo-go will be replace to github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID}" || echo 'go get github.com/apache/dubbo-go@develop'
RUN test ${PR_ORIGIN_REPO} && echo "module github.com/apache/dubbo-go/test/integrate/dubbo/go-client" > go.mod
RUN test ${PR_ORIGIN_REPO} && sed -n '2,$p' go.main.mod >> go.mod
RUN test ${PR_ORIGIN_REPO} && go mod edit -replace=github.com/apache/dubbo-go=github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID} || go mod vendor
RUN test ${PR_ORIGIN_REPO} && go mod edit -replace=github.com/apache/dubbo-go=github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID} || go get -u github.com/apache/dubbo-go@develop
RUN go install github.com/apache/dubbo-go/test/integrate/dubbo/go-client
......
module github.com/apache/dubbo-go/test/integrate/dubbo/go-client
require (
github.com/apache/dubbo-go-hessian2 v1.6.0-rc1.0.20200906044240-6c1fb5c3bd44
)
go 1.13
......@@ -26,12 +26,9 @@ ARG PR_ORIGIN_REPO
ARG PR_ORIGIN_COMMITID
ADD . /go/src/github.com/apache/dubbo-go/test/integrate/dubbo/go-server
# update dubbo-go to current commit id
RUN test ${PR_ORIGIN_REPO} && echo "github.com/apache/dubbo-go will be replace to github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID}" || echo 'go get github.com/apache/dubbo-go@develop'
RUN test ${PR_ORIGIN_REPO} && echo "module github.com/apache/dubbo-go/test/integrate/dubbo/go-server" > go.mod
RUN test ${PR_ORIGIN_REPO} && sed -n '2,$p' go.main.mod >> go.mod
RUN test ${PR_ORIGIN_REPO} && go mod edit -replace=github.com/apache/dubbo-go=github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID} || go mod vendor
RUN test ${PR_ORIGIN_REPO} && go mod edit -replace=github.com/apache/dubbo-go=github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID} || go get -u github.com/apache/dubbo-go@develop
RUN go install github.com/apache/dubbo-go/test/integrate/dubbo/go-server
......
module github.com/apache/dubbo-go/test/integrate/dubbo/go-server
require (
github.com/apache/dubbo-go-hessian2 v1.6.0-rc1.0.20200906044240-6c1fb5c3bd44
)
go 1.13
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment