admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-07 01:28:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance: Add scripts to use gotestsum to execute integration test (#31490)

Browse Source 
See also #31489

---------

Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
congqixia 2024-03-22 10:29:06 +08:00 committed by GitHub
parent d90e01532f
commit 4da8b6607d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yaml vendored
View File

@ -219,7 +219,7 @@ jobs:
run: | run: |
chmod +x build/builder.sh chmod +x build/builder.sh
chmod +x scripts/run_intergration_test.sh chmod +x scripts/run_intergration_test.sh
./build/builder.sh /bin/bash -c ./scripts/run_intergration_test.sh ./build/builder.sh /bin/bash -c "make integration-test"
- name: Archive result - name: Archive result
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:

16
Makefile
View File

@ -55,6 +55,10 @@ INSTALL_GCI := $(findstring $(GCI_VERSION),$(GCI_OUTPUT))
GOFUMPT_VERSION := 0.5.0 GOFUMPT_VERSION := 0.5.0
GOFUMPT_OUTPUT := $(shell $(INSTALL_PATH)/gofumpt --version 2>/dev/null) GOFUMPT_OUTPUT := $(shell $(INSTALL_PATH)/gofumpt --version 2>/dev/null)
INSTALL_GOFUMPT := $(findstring $(GOFUMPT_VERSION),$(GOFUMPT_OUTPUT)) INSTALL_GOFUMPT := $(findstring $(GOFUMPT_VERSION),$(GOFUMPT_OUTPUT))
# gotestsum
GOTESTSUM_VERSION := 1.11.0
GOTESTSUM_OUTPUT := $(shell $(INSTALL_PATH)/gotestsum --version 2>/dev/null)
INSTALL_GOTESTSUM := $(findstring $(GOTESTSUM_VERSION),$(GOTESTSUM_OUTPUT))
index_engine = knowhere index_engine = knowhere
@ -94,6 +98,11 @@ getdeps:
else \ else \
echo "Mockery v$(MOCKERY_VERSION) already installed"; \ echo "Mockery v$(MOCKERY_VERSION) already installed"; \
fi fi
@if [ -z "$(INSTALL_GOTESTSUM)" ]; then \
echo "Install gotestsum v$(GOTESTSUM_VERSION) to ./bin/" && curl -sSL "https://github.com/gotestyourself/gotestsum/releases/download/v$(GOTESTSUM_VERSION)/gotestsum_$(GOTESTSUM_VERSION)_linux_amd64.tar.gz" | tar -xz -C ./bin/ gotestsum ; \
else \
echo "gotestsum v$(GOTESTSUM_VERSION) already installed";\
fi
tools/bin/revive: tools/check/go.mod tools/bin/revive: tools/check/go.mod
cd tools/check; \ cd tools/check; \
@ -166,12 +175,13 @@ meta-migration:
-tags dynamic -o $(INSTALL_PATH)/meta-migration $(MIGRATION_PATH)/main.go 1>/dev/null -tags dynamic -o $(INSTALL_PATH)/meta-migration $(MIGRATION_PATH)/main.go 1>/dev/null
INTERATION_PATH = $(PWD)/tests/integration INTERATION_PATH = $(PWD)/tests/integration
integration-test: integration-test: getdeps
@echo "Building integration tests ..." @echo "Building integration tests ..."
@source $(PWD)/scripts/setenv.sh && \ @(env bash $(PWD)/scripts/run_intergration_test.sh "$(INSTALL_PATH)/gotestsum --")
#@source $(PWD)/scripts/setenv.sh && \
mkdir -p $(INSTALL_PATH) && go env -w CGO_ENABLED="1" && \ mkdir -p $(INSTALL_PATH) && go env -w CGO_ENABLED="1" && \
GO111MODULE=on $(GO) build -ldflags="-r $${RPATH} -X '$(OBJPREFIX).BuildTags=$(BUILD_TAGS)' -X '$(OBJPREFIX).BuildTime=$(BUILD_TIME)' -X '$(OBJPREFIX).GitCommit=$(GIT_COMMIT)' -X '$(OBJPREFIX).GoVersion=$(GO_VERSION)'" \ GO111MODULE=on $(GO) build -ldflags="-r $${RPATH} -X '$(OBJPREFIX).BuildTags=$(BUILD_TAGS)' -X '$(OBJPREFIX).BuildTime=$(BUILD_TIME)' -X '$(OBJPREFIX).GitCommit=$(GIT_COMMIT)' -X '$(OBJPREFIX).GoVersion=$(GO_VERSION)'" \
-tags dynamic -o $(INSTALL_PATH)/integration-test $(INTERATION_PATH)/ 1>/dev/null -tags dynamic -o $(INSTALL_PATH)/integration-test $(INTERATION_PATH)/ #1>/dev/null
BUILD_TAGS = $(shell git describe --tags --always --dirty="-dev") BUILD_TAGS = $(shell git describe --tags --always --dirty="-dev")
BUILD_TAGS_GPU = ${BUILD_TAGS}-gpu BUILD_TAGS_GPU = ${BUILD_TAGS}-gpu

13
scripts/run_intergration_test.sh
View File

@ -23,20 +23,25 @@ FILE_COVERAGE_INFO="it_coverage.txt"
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
source $BASEDIR/setenv.sh source $BASEDIR/setenv.sh
set -ex TEST_CMD=$@
if [ -z "$TEST_CMD" ]; then
TEST_CMD="go test"
fi
set -e
echo "mode: atomic" > ${FILE_COVERAGE_INFO} echo "mode: atomic" > ${FILE_COVERAGE_INFO}
# starting the timer # starting the timer
beginTime=`date +%s` beginTime=`date +%s`
for d in $(go list ./tests/integration/...); do for d in $(go list ./tests/integration/...); do
echo "Testing $d" echo "Start to run integration test under \"$d\" pkg"
if [[ $d == *"coordrecovery"* ]]; then if [[ $d == *"coordrecovery"* ]]; then
echo "running coordrecovery" echo "running coordrecovery"
# simplified command to speed up coord init test since it is large. # simplified command to speed up coord init test since it is large.
go test -tags dynamic -v -coverprofile=profile.out -covermode=atomic "$d" -caseTimeout=20m -timeout=30m $TEST_CMD -tags dynamic -v -coverprofile=profile.out -covermode=atomic "$d" -caseTimeout=20m -timeout=30m
else else
go test -race -tags dynamic -v -coverpkg=./... -coverprofile=profile.out -covermode=atomic "$d" -caseTimeout=15m -timeout=30m $TEST_CMD -race -tags dynamic -v -coverpkg=./... -coverprofile=profile.out -covermode=atomic "$d" -caseTimeout=15m -timeout=30m
fi fi
if [ -f profile.out ]; then if [ -f profile.out ]; then
grep -v kafka profile.out | grep -v planparserv2/generated | grep -v mocks | sed '1d' >> ${FILE_COVERAGE_INFO} grep -v kafka profile.out | grep -v planparserv2/generated | grep -v mocks | sed '1d' >> ${FILE_COVERAGE_INFO}