diff --git a/integrate_test.sh b/integrate_test.sh index c9c2f23b5b07f0baf96260d8092e7464d4d15659..c54172ec5e27bc14fad0a1da631f0c8c601eb662 100644 --- a/integrate_test.sh +++ b/integrate_test.sh @@ -52,12 +52,16 @@ 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} diff --git a/test/integrate/dubbo/go-client/Dockerfile b/test/integrate/dubbo/go-client/Dockerfile index d48df36dc72d7e75f8c2c8c91d5acbb01e39757d..0c614eed6bc1dce9ff57bb983b73fcd49467dc85 100644 --- a/test/integrate/dubbo/go-client/Dockerfile +++ b/test/integrate/dubbo/go-client/Dockerfile @@ -29,7 +29,9 @@ 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} && 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 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 go install github.com/apache/dubbo-go/test/integrate/dubbo/go-client diff --git a/test/integrate/dubbo/go-client/go.mod b/test/integrate/dubbo/go-client/go.mod index b0be45ae9c820dc200a1e642a8c73535b13e9f4d..4708eb1f0f48c10acc254880ecb6dad3a03529f2 100644 --- a/test/integrate/dubbo/go-client/go.mod +++ b/test/integrate/dubbo/go-client/go.mod @@ -1,7 +1,3 @@ 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 diff --git a/test/integrate/dubbo/go-server/Dockerfile b/test/integrate/dubbo/go-server/Dockerfile index c2f2d63462d94df7624ac100023e8b8c24e23e11..1d6ea286c7554265be36c134a16ba5bef1f1a9cf 100644 --- a/test/integrate/dubbo/go-server/Dockerfile +++ b/test/integrate/dubbo/go-server/Dockerfile @@ -26,9 +26,12 @@ 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} && 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 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 go install github.com/apache/dubbo-go/test/integrate/dubbo/go-server diff --git a/test/integrate/dubbo/go-server/go.mod b/test/integrate/dubbo/go-server/go.mod index 6c530f6a5973c379e98d9c2cca5d7511eabab830..9e1162327de374fb131c2a0b89d1be3baa578a1b 100644 --- a/test/integrate/dubbo/go-server/go.mod +++ b/test/integrate/dubbo/go-server/go.mod @@ -1,7 +1,3 @@ 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