From 55a61db590f2ce25f6920b1d7ea84e3bf8edfda2 Mon Sep 17 00:00:00 2001 From: EiffelFly <57251712+EiffelFly@users.noreply.github.com> Date: Fri, 23 Sep 2022 19:21:54 +0800 Subject: [PATCH 1/5] feat: add console e2e test into vdp --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index d43e63ee..d6c2da09 100644 --- a/Makefile +++ b/Makefile @@ -91,6 +91,7 @@ doc: ## Run Redoc for OpenAPI spec at http://localhost:3001 integration-test: ## Run integration test for all dev repositories @make build PROFILE=all @make dev PROFILE=all + @cd dev/console && npm install && npx playwright install && npx playwright test @cd dev/pipeline-backend && HOSTNAME=localhost make integration-test @cd dev/connector-backend && HOSTNAME=localhost make integration-test @cd dev/model-backend && HOSTNAME=localhost make integration-test From d92baa2d18f43faa6f10f21b7aed1e766f49a941 Mon Sep 17 00:00:00 2001 From: EiffelFly <57251712+EiffelFly@users.noreply.github.com> Date: Wed, 26 Oct 2022 20:13:44 +0800 Subject: [PATCH 2/5] feat: enable model-backend mock --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d6c2da09..08bc8d91 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,8 @@ doc: ## Run Redoc for OpenAPI spec at http://localhost:3001 .PHONY: integration-test integration-test: ## Run integration test for all dev repositories @make build PROFILE=all - @make dev PROFILE=all + sed 's/CFG_SERVER_PORT: 8083/CFG_SERVER_PORT: 8083\n CFG_SERVER_ITMODE: "true"/g' docker-compose-dev.yml > /tmp/docker-compose-integration-test.yml + COMPOSE_PROFILES=all docker-compose -f /tmp/docker-compose-integration-test.yml up -d @cd dev/console && npm install && npx playwright install && npx playwright test @cd dev/pipeline-backend && HOSTNAME=localhost make integration-test @cd dev/connector-backend && HOSTNAME=localhost make integration-test From 36d59c28e3cb1a326860f17efbf4e250357decfd Mon Sep 17 00:00:00 2001 From: EiffelFly <57251712+EiffelFly@users.noreply.github.com> Date: Wed, 26 Oct 2022 22:38:11 +0800 Subject: [PATCH 3/5] feat: update makefile --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 08bc8d91..8ef53c60 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ doc: ## Run Redoc for OpenAPI spec at http://localhost:3001 .PHONY: integration-test integration-test: ## Run integration test for all dev repositories @make build PROFILE=all - sed 's/CFG_SERVER_PORT: 8083/CFG_SERVER_PORT: 8083\n CFG_SERVER_ITMODE: "true"/g' docker-compose-dev.yml > /tmp/docker-compose-integration-test.yml + @sed 's/CFG_SERVER_PORT: 8083/CFG_SERVER_PORT: 8083\n CFG_SERVER_ITMODE: "true"/g' docker-compose-dev.yml > /tmp/docker-compose-integration-test.yml COMPOSE_PROFILES=all docker-compose -f /tmp/docker-compose-integration-test.yml up -d @cd dev/console && npm install && npx playwright install && npx playwright test @cd dev/pipeline-backend && HOSTNAME=localhost make integration-test @@ -98,6 +98,7 @@ integration-test: ## Run integration test for all dev repositories @cd dev/model-backend && HOSTNAME=localhost make integration-test @cd dev/mgmt-backend && HOSTNAME=localhost make integration-test @make down + @rm /tmp/docker-compose-integration-test.yml .PHONY: help help: ## Show this help From 8fa5d06f7e26cbd726290b179368c30f5ecf79f3 Mon Sep 17 00:00:00 2001 From: Phelan164 Date: Thu, 17 Nov 2022 14:52:19 +0700 Subject: [PATCH 4/5] chore: disable usage and remove log verbose in triton backend --- .env | 2 +- docker-compose-dev.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index cfb13f43..ddf46f8e 100644 --- a/.env +++ b/.env @@ -6,7 +6,7 @@ DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 # usage collection flag -DISABLEUSAGE=false +DISABLEUSAGE=true # pipeline-backend PIPELINE_BACKEND_VERSION=0.8.0-alpha diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index b0a7e17b..ddbbc0fc 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -388,7 +388,7 @@ services: environment: NVIDIA_VISIBLE_DEVICES: 0 LD_PRELOAD: /opt/tritonserver/lib/libgomp-d22c30c5.so.1 - command: tritonserver --model-store=/model-repository --model-control-mode=explicit --allow-http=true --strict-model-config=false --log-verbose=1 + command: tritonserver --model-store=/model-repository --model-control-mode=explicit --allow-http=true --strict-model-config=false ports: - ${TRITON_SERVER_PORT}:8001 volumes: From 7b45c9804889de624ce1b8a2efc83e95ccf2e7e3 Mon Sep 17 00:00:00 2001 From: Phelan164 Date: Wed, 23 Nov 2022 23:44:23 +0700 Subject: [PATCH 5/5] chore: update ITMODE in integration-test --- .env | 7 ++++++- Makefile | 4 +--- docker-compose-dev.yml | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.env b/.env index ddf46f8e..87788af8 100644 --- a/.env +++ b/.env @@ -6,7 +6,7 @@ DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 # usage collection flag -DISABLEUSAGE=true +DISABLEUSAGE=false # pipeline-backend PIPELINE_BACKEND_VERSION=0.8.0-alpha @@ -64,3 +64,8 @@ TEMPORAL_UI_PORT=8088 REDOC_OPENAPI_VERSION=v2.0.0-rc.70 REDOC_OPENAPI_HOST=redoc-openapi REDOC_OPENAPI_PORT=3001 + +# This flag is used for integration test in which dummy model is used instead of pulling model from GitHub, HuggingFace or ArtiVC. +# The reason is reducing the impact of network trouble during integration test +# The default value is alway false, only set when running `make integration-test` +ITMODE=false \ No newline at end of file diff --git a/Makefile b/Makefile index 8ef53c60..fc42a5e3 100644 --- a/Makefile +++ b/Makefile @@ -90,15 +90,13 @@ doc: ## Run Redoc for OpenAPI spec at http://localhost:3001 .PHONY: integration-test integration-test: ## Run integration test for all dev repositories @make build PROFILE=all - @sed 's/CFG_SERVER_PORT: 8083/CFG_SERVER_PORT: 8083\n CFG_SERVER_ITMODE: "true"/g' docker-compose-dev.yml > /tmp/docker-compose-integration-test.yml - COMPOSE_PROFILES=all docker-compose -f /tmp/docker-compose-integration-test.yml up -d + @make dev PROFILE=all ITMODE=true @cd dev/console && npm install && npx playwright install && npx playwright test @cd dev/pipeline-backend && HOSTNAME=localhost make integration-test @cd dev/connector-backend && HOSTNAME=localhost make integration-test @cd dev/model-backend && HOSTNAME=localhost make integration-test @cd dev/mgmt-backend && HOSTNAME=localhost make integration-test @make down - @rm /tmp/docker-compose-integration-test.yml .PHONY: help help: ## Show this help diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index ddbbc0fc..9c166d1f 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -258,6 +258,7 @@ services: environment: CFG_SERVER_PORT: 8083 CFG_SERVER_DEBUG: "true" + CFG_SERVER_ITMODE: ${ITMODE} CFG_SERVER_DISABLEUSAGE: ${DISABLEUSAGE} CFG_SERVER_EDITION: local-ce:latest CFG_DATABASE_HOST: ${POSTGRESQL_HOST}