From fdcec212159b3f04559e355466679f487e0f3fc2 Mon Sep 17 00:00:00 2001
From: "scott.wang" <scottwangsxll@gmail.com>
Date: Thu, 21 May 2020 14:53:51 +0800
Subject: [PATCH] Add extra logic for Dockerfile
---
integrate_test.sh | 27 ++++++++++++++++-------
test/integrate/dubbo/go-client/Dockerfile | 4 ++--
test/integrate/dubbo/go-server/Dockerfile | 4 ++--
3 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/integrate_test.sh b/integrate_test.sh
index eacd9a58c..6480ffeeb 100644
--- a/integrate_test.sh
+++ b/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
diff --git a/test/integrate/dubbo/go-client/Dockerfile b/test/integrate/dubbo/go-client/Dockerfile
index 1c683613f..dbe7608cc 100644
--- a/test/integrate/dubbo/go-client/Dockerfile
+++ b/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
diff --git a/test/integrate/dubbo/go-server/Dockerfile b/test/integrate/dubbo/go-server/Dockerfile
index 05596980c..5b4817e3c 100644
--- a/test/integrate/dubbo/go-server/Dockerfile
+++ b/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
--
GitLab