From dde39aa24c06cae3161cb67a71b203c1142733f9 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Fri, 28 Oct 2022 15:21:11 +0200 Subject: [PATCH] Remove general v1 makefile entry Signed-off-by: Kristoffer Dalby --- Makefile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Makefile b/Makefile index cb91e8c6..1110d09a 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ dev: lint test build test: @go test -short -coverprofile=coverage.out ./... -test_integration: test_integration_cli test_integration_derp test_integration_oidc test_integration_general +test_integration: test_integration_cli test_integration_derp test_integration_oidc test_integration_v2_general test_integration_cli: docker network rm $$(docker network ls --filter name=headscale --quiet) || true @@ -46,16 +46,6 @@ test_integration_derp: -v /var/run/docker.sock:/var/run/docker.sock golang:1 \ go test -failfast -timeout 30m -count=1 -run IntegrationDERP ./... -test_integration_general: - docker network rm $$(docker network ls --filter name=headscale --quiet) || true - docker network create headscale-test || true - docker run -t --rm \ - --network headscale-test \ - -v ~/.cache/hs-integration-go:/go \ - -v $$PWD:$$PWD -w $$PWD \ - -v /var/run/docker.sock:/var/run/docker.sock golang:1 \ - go test -failfast -timeout 30m -count=1 -run IntegrationGeneral ./... - test_integration_oidc: docker network rm $$(docker network ls --filter name=headscale --quiet) || true docker network create headscale-test || true