Merge pull request #1759 from dnephin/single-integration-target

Remove duplicate integration target

Makefile

@@ -125,10 +125,6 @@ root-test: ## run tests, except integration tests
 	@go test ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${TEST_REQUIRES_ROOT_PACKAGES}) -test.root
 
 integration: ## run integration tests
-	@echo "$(WHALE) $@"
-	@go test ${TESTFLAGS} -test.root -parallel 1
-
-integration-parallel: ## run integration tests
 	@echo "$(WHALE) $@"
 	@go test ${TESTFLAGS} -test.root -parallel ${TESTFLAGS_PARALLEL}
 
@@ -200,10 +196,6 @@ root-coverage: ## generate coverage profiles for unit tests that require root
 		fi; \
 	done )
 
-coverage-integration: ## generate coverprofiles from the integration tests
-	@echo "$(WHALE) $@"
-	go test ${TESTFLAGS} -test.short -coverprofile="../../../${INTEGRATION_PACKAGE}/coverage.txt" -covermode=atomic ${INTEGRATION_PACKAGE} -test.root
-
 vendor:
 	@echo "$(WHALE) $@"
 	@vndr