Merge remote-tracking branch 'upstream/master' into lts

Author: MarkEWaite

Makefile

@@ -100,10 +100,7 @@ test-%: prepare-test
 # Ensure that the image is built
 	@make --silent build-$*
 # Execute the test harness and write result to a TAP file
-	IMAGE=$* bats/bin/bats $(bats_flags) | tee target/results-$*.tap
-# convert TAP to JUNIT
-	docker run --rm -v "$(CURDIR)":/usr/src/app -w /usr/src/app node:22-alpine \
-		sh -c "npm install -g npm@latest && npm install tap-xunit -g && cat target/results-$*.tap | tap-xunit --package='jenkinsci.docker.$*' > target/junit-results-$*.xml"
+	IMAGE=$* bats/bin/bats $(bats_flags) --formatter junit | tee target/junit-results-$*.xml
 
 test: prepare-test
 	@make --silent list | while read image; do make --silent "test-$${image}"; done