From b2edc2ab9d3fe4dfb1940cfc04237cc758cbb34e Mon Sep 17 00:00:00 2001 From: Ilya Andreev <18560147+andreev-io@users.noreply.github.com> Date: Thu, 23 Jan 2025 10:52:37 +0000 Subject: [PATCH] Don't run integration tests within make test --- Makefile | 2 +- README.md | 3 ++- pkg/labeler/remote_test.go | 2 +- test/test-kind.sh | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ddb90d3..6383569 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ build: tidy lint vendor ## Build binaries (Linux only). GOOS=linux go build -o bin/ ./... test: tidy lint vendor ## Run unit tests (Linux only). - CGO_ENABLED=1 GOOS=linux go test -v -race -coverprofile cover.out ./... + CGO_ENABLED=1 GOOS=linux go test -v -race -coverprofile cover.out $(go list ./... | grep -v integration) ./... docker-build: ## Build Docker image. docker build \ diff --git a/README.md b/README.md index e0c38c6..7c58a7c 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,9 @@ - [x] Move clickhouse username/password into a secret (same in internal flowd) - [x] Refactor Makefile & Dockerfile - [ ] Actions and build plaques -- [ ] README with a ClickHouse Cloud tutorial +- [ ] README with a ClickHouse Cloud tutorial, LICENSE - [ ] Clean up commit history +- [ ] Configure repository settings # kubenetmon diff --git a/pkg/labeler/remote_test.go b/pkg/labeler/remote_test.go index 94f0753..67ef59c 100644 --- a/pkg/labeler/remote_test.go +++ b/pkg/labeler/remote_test.go @@ -280,7 +280,7 @@ func TestGetCloudRegions(t *testing.T) { assert.NotNil(t, regions) assert.Contains(t, regions, "westus3") assert.Contains(t, regions, "eastus2") - assert.Contains(t, regions, "germanywestcentral") + assert.Contains(t, regions, "germanywc") assert.Contains(t, regions, "eastus") } diff --git a/test/test-kind.sh b/test/test-kind.sh index e72e1fd..0b1989d 100755 --- a/test/test-kind.sh +++ b/test/test-kind.sh @@ -58,7 +58,7 @@ helm template kubenetmon-agent ./deploy/helm/kubenetmon-agent \ --set image.tag=1.0.0 \ --namespace=kubenetmon-agent | kubectl apply -n kubenetmon-agent -f - echo "Waiting for kubenetmon-agent pods to be ready..." -kubectl wait --namespace kubenetmon-agent --for=condition=ready pod -l app.kubernetes.io/name=kubenetmon-agent --timeout=120s +kubectl wait --namespace kubenetmon-agent --for=condition=ready pod -l app.kubernetes.io/name=kubenetmon-agent --timeout=180s echo "Kind cluster setup complete. Run 'kubectl get pods --all-namespaces' to verify."