From 0db5412a8ff632852f88bbbb9c65057a6020887f Mon Sep 17 00:00:00 2001
From: Erik Brakkee <erik@brakkee.org>
Date: Wed, 20 Nov 2024 22:23:53 +0100
Subject: [PATCH] correct usage of go2junit

---
 Jenkinsfile | 4 ++--
 Makefile    | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8219948..bb8ac3d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -56,8 +56,8 @@ pipeline {
   }
   post {
     always {
-      junit 'testout/junit.xml'
-      junit 'testout/integrationtest.xml'
+      junit 'testout/junit/**/*.xml'
+      junit 'testout/integrationtest/**/*.xml'
     }
   }
 }
diff --git a/Makefile b/Makefile
index e2a9c71..9537101 100644
--- a/Makefile
+++ b/Makefile
@@ -21,12 +21,12 @@ vet: fmt
 test: build
 	mkdir -p testout
 	go test -count=1 -coverprofile=testout/coverage.out -json ${TESTFLAGS} ./pkg/... ./cmd/... 2>&1 | \
-          go2junit - > testout/junit.xml
+          go2junit testout/junit
         
 integrationtest: build
 	mkdir -p testout 
 	go test -count=1 ${TESTFLAGS} ./integrationtest/... -json 2>&1 |  \
-          go2junit - > testout/integrationtest.xml 
+          go2junit testout/integrationtest
 
 build: generate vet
 	mkdir -p bin
@@ -40,6 +40,7 @@ clean:
 	rm -rf bin
 	rm -rf static/icons
 	rm -f pkg/server/ui/LICENSE*
+	rm -rf testout
 
 static/icons/.downloaded:
 	./getbootstrapicons.sh