Do not mess with git except in CI

nephio-project · Dec 19, 2023 · 769c8d0 · 769c8d0
1 parent bf9f38e
commit 769c8d0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/.prow.yaml b/.prow.yaml
@@ -8,7 +8,7 @@ presubmits:
         command:
         - make
         args:
-        - unit
+        - ci-unit
   - name: presubmit-porch-e2e
     decorate: true
     optional: true
@@ -19,4 +19,4 @@ presubmits:
         command:
         - make
         args:
-        - test-porch
+        - ci-test-porch
diff --git a/Makefile b/Makefile
@@ -157,6 +157,18 @@ tidy:
 test-porch:
 	@for f in $(MODULES); do (cd $$f; echo "Testing $$f"; E2E=1 go test -race --count=1 ./...) || exit 1; done
 
+.PHONY: configure-git
+configure-git:
+	git config --global --add user.name test
+	git config --global --add user.email test@nephio.org
+
+.PHONY: ci-test-porch
+ci-test-porch: configure-git test-porch
+
+.PHONY: ci-unit
+ci-test-porch: configure-git test
+
+
 PORCH = $(BUILDDIR)/porch
 
 .PHONY: run-local

diff --git a/default-go-test.mk b/default-go-test.mk
@@ -32,8 +32,6 @@ ifeq ($(CONTAINER_RUNNABLE), 0)
          go tool cover -html=${TEST_COVERAGE_FILE} -o ${TEST_COVERAGE_HTML_FILE}; \
          go tool cover -func=${TEST_COVERAGE_FILE} -o ${TEST_COVERAGE_FUNC_FILE}"
 else
-		git config --global --add user.name test
-		git config --global --add user.email test@nephio.org
 		go test ./... -v -coverprofile ${TEST_COVERAGE_FILE}
 		go tool cover -html=${TEST_COVERAGE_FILE} -o ${TEST_COVERAGE_HTML_FILE}
 		go tool cover -func=${TEST_COVERAGE_FILE} -o ${TEST_COVERAGE_FUNC_FILE}