diff --git a/controller/Makefile b/controller/Makefile index f0fc33811e36bc15f6f317da203bf8190e7c9a7e..52a101ee3efff0c92ea729ca69c1fc668f2fa4e0 100644 --- a/controller/Makefile +++ b/controller/Makefile @@ -41,10 +41,10 @@ controller-test: install-tools ENVIRONMENT=testing ./$(TOOLS_DIR)/gotestsum --junitfile report.xml --format testname -- -race -v -run TestRun lint: install-tools - ./$(TOOLS_DIR)/golangci-lint run --config .gitlab/ci/.golangci-config/.golangci.yml + ./$(TOOLS_DIR)/golangci-lint run --config ../.golangci.yml | jq lint-fix: install-tools - ./$(TOOLS_DIR)/golangci-lint run --config .gitlab/ci/.golangci-config/.golangci.yml --fix + ./$(TOOLS_DIR)/golangci-lint run --config ../.golangci.yml --fix ci-lint: golangci-lint run --config ../.gitlab/ci/.golangci-config/.golangci.yml --out-format code-climate | jq -r '.[] | "\(.location.path):\(.location.lines.begin) \(.description)"' @@ -56,7 +56,7 @@ ci-controller-test: ci-install-tools ENVIRONMENT=testing gotestsum --junitfile report.xml --format testname -- -race -v -run TestRun integration-test-nucleus: - ENVIRONMENT=testing &&\ + ENVIRONMENT=testing &&\ cd ./test/integration &&\ go test -race -v -run TestGnmi_SetIntegration &&\ go test -race -v -run TestGnmi_GetIntegration &&\ @@ -64,6 +64,6 @@ integration-test-nucleus: go test -race -v -run TestGnmi_CapabilitiesIntegration integration-test-api: - ENVIRONMENT=testing &&\ + ENVIRONMENT=testing &&\ cd ./api &&\ go test -race -v -run TestApiIntegration