Add extra logic for Dockerfile

integrate_test.sh

@@ -51,11 +51,22 @@ echo "travis pull request repo slug -> ${TRAVIS_REPO_SLUG}"
 docker run -d --network host zookeeper
 echo "zookeeper listen in [:]2181"
 
-# fast fail
-exit 1
-
-
-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}
-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
-docker run -it --network host ci-consumer
+if [ ${TRAVIS_PULL_REQUEST_SLUG} ]
+then
+    # this is a pull-request commit
+    # build go-client image
+    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}
+    # build go-server image
+    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}
+    # run provider
+    docker run -d --network host ci-provider
+    # check consumer status
+    docker run -it --network host ci-consumer
+else
+    # this is merge pull-request to local-repo
+    echo ''
+fi

test/integrate/dubbo/go-client/Dockerfile

@@ -28,8 +28,8 @@ ARG PR_ORIGIN_COMMITID
 ADD . /go/src/github.com/apache/dubbo-go/test/integrate/dubbo/go-client
 
 # update dubbo-go to current commit id
-RUN echo "github.com/apache/dubbo-go will be replace to github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID}"
-RUN go mod edit  -replace=github.com/apache/dubbo-go=github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID}
+RUN test ${PR_ORIGIN_REPO} && echo "github.com/apache/dubbo-go will be replace to github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID}"
+RUN test ${PR_ORIGIN_REPO} && go mod edit  -replace=github.com/apache/dubbo-go=github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID}
 
 RUN go install github.com/apache/dubbo-go/test/integrate/dubbo/go-client
 

test/integrate/dubbo/go-server/Dockerfile

@@ -27,8 +27,8 @@ 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 echo "github.com/apache/dubbo-go will be replace to github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID}"
-RUN go mod edit  -replace=github.com/apache/dubbo-go=github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID}
+RUN test ${PR_ORIGIN_REPO} && cho "github.com/apache/dubbo-go will be replace to github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID}"
+RUN test ${PR_ORIGIN_REPO} && o mod edit  -replace=github.com/apache/dubbo-go=github.com/${PR_ORIGIN_REPO}@${PR_ORIGIN_COMMITID}
 
 RUN go install github.com/apache/dubbo-go/test/integrate/dubbo/go-server