From 0387bbdc025906471fb234bc5a5f0c43008bd6c2 Mon Sep 17 00:00:00 2001 From: hantmac Date: Sun, 15 Dec 2019 09:18:13 +0800 Subject: [PATCH 1/3] Update test cases --- backend/mock/schedule.go | 13 +++++++++---- backend/mock/schedule_test.go | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/backend/mock/schedule.go b/backend/mock/schedule.go index 702e8754..57d757e7 100644 --- a/backend/mock/schedule.go +++ b/backend/mock/schedule.go @@ -10,12 +10,15 @@ import ( "time" ) +var NodeIdss = []bson.ObjectId{bson.ObjectIdHex("5d429e6c19f7abede924fee2"), + bson.ObjectIdHex("5d429e6c19f7abede924fee1")} + var scheduleList = []model.Schedule{ { Id: bson.ObjectId("5d429e6c19f7abede924fee2"), Name: "test schedule", SpiderId: "123", - NodeId: bson.ObjectId("5d429e6c19f7abede924fee2"), + NodeIds: NodeIdss, Cron: "***1*", EntryId: 10, // 前端展示 @@ -29,7 +32,7 @@ var scheduleList = []model.Schedule{ Id: bson.ObjectId("xx429e6c19f7abede924fee2"), Name: "test schedule2", SpiderId: "234", - NodeId: bson.ObjectId("5d429e6c19f7abede924fee2"), + NodeIds: NodeIdss, Cron: "***1*", EntryId: 10, // 前端展示 @@ -100,8 +103,10 @@ func PutSchedule(c *gin.Context) { } // 如果node_id为空，则置为空ObjectId - if item.NodeId == "" { - item.NodeId = bson.ObjectIdHex(constants.ObjectIdNull) + for _, NodeId := range item.NodeIds { + if NodeId == "" { + NodeId = bson.ObjectIdHex(constants.ObjectIdNull) + } } c.JSON(http.StatusOK, Response{ diff --git a/backend/mock/schedule_test.go b/backend/mock/schedule_test.go index 12843c75..2c5c2701 100644 --- a/backend/mock/schedule_test.go +++ b/backend/mock/schedule_test.go @@ -75,7 +75,7 @@ func TestPostSchedule(t *testing.T) { Id: bson.ObjectIdHex("5d429e6c19f7abede924fee2"), Name: "test schedule", SpiderId: bson.ObjectIdHex("5d429e6c19f7abede924fee2"), - NodeId: bson.ObjectIdHex("5d429e6c19f7abede924fee2"), + NodeIds: NodeIdss, Cron: "***1*", EntryId: 10, // 前端展示 @@ -112,7 +112,7 @@ func TestPutSchedule(t *testing.T) { Id: bson.ObjectIdHex("5d429e6c19f7abede924fee2"), Name: "test schedule", SpiderId: bson.ObjectIdHex("5d429e6c19f7abede924fee2"), - NodeId: bson.ObjectIdHex("5d429e6c19f7abede924fee2"), + NodeIds: NodeIdss, Cron: "***1*", EntryId: 10, // 前端展示 From d75c832a384b3ba4d9142a80c4e9c2f5992af1f9 Mon Sep 17 00:00:00 2001 From: Yabo <386139859@qq.com> Date: Sun, 15 Dec 2019 11:13:16 +0800 Subject: [PATCH 2/3] :fire: reduce docker image --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0809a0ba..ddb4d47e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,6 @@ RUN apt-get update \ RUN pip install scrapy pymongo bs4 requests -i https://pypi.tuna.tsinghua.edu.cn/simple # copy backend files -COPY --from=backend-build /go/src/app . COPY --from=backend-build /go/bin/crawlab /usr/local/bin # install nginx From 28bccc36c8bf986c026189737998ed06810c9e9b Mon Sep 17 00:00:00 2001 From: marvzhang Date: Sun, 15 Dec 2019 12:30:52 +0800 Subject: [PATCH 3/3] updated docker-compose.yml --- jenkins/develop/docker-compose.yaml | 4 ---- jenkins/master/docker-compose.yaml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/jenkins/develop/docker-compose.yaml b/jenkins/develop/docker-compose.yaml index ec95ae9f..745c0bdc 100644 --- a/jenkins/develop/docker-compose.yaml +++ b/jenkins/develop/docker-compose.yaml @@ -27,10 +27,6 @@ services: mongo: image: mongo:latest restart: always - ports: - - "27027:27017" redis: image: redis:latest restart: always - ports: - - "6389:6379" \ No newline at end of file diff --git a/jenkins/master/docker-compose.yaml b/jenkins/master/docker-compose.yaml index 1b7a476b..57cacc49 100644 --- a/jenkins/master/docker-compose.yaml +++ b/jenkins/master/docker-compose.yaml @@ -29,12 +29,8 @@ services: restart: always volumes: - "/opt/crawlab/mongo/data/db:/data/db" - ports: - - "27017:27017" redis: image: redis:latest restart: always volumes: - "/opt/crawlab/redis/data:/data" - ports: - - "6379:6379" \ No newline at end of file