From 01b3795151f229cc560bd6f497fb8723484d125e Mon Sep 17 00:00:00 2001
From: Andre Sterba <andre.sterba@stud.h-da.de>
Date: Thu, 21 Apr 2022 14:25:58 +0000
Subject: [PATCH] Fix controller integration tests

See merge request danet/gosdn!291
---
 controller/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/controller/Makefile b/controller/Makefile
index f0fc33811..52a101ee3 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
-- 
GitLab