From 0f24396263178b015b61a3044fa2ba96f54c3cfe Mon Sep 17 00:00:00 2001
From: Ben Parees <bparees@redhat.com>
Date: Thu, 31 Aug 2017 11:55:24 -0400
Subject: [PATCH] delete non-junit file before junit merge

---
 test/extended/setup.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/extended/setup.sh b/test/extended/setup.sh
index a4e58827dcbe..98899edb5c3b 100644
--- a/test/extended/setup.sh
+++ b/test/extended/setup.sh
@@ -248,6 +248,8 @@ function os::test::extended::merge_junit () {
 	fi
 	local output
 	output="$( mktemp )"
+	# this file isn't junit output and screws up junit merge.
+	rm /data/src/github.com/openshift/origin/_output/scripts/core/artifacts/build-job-clone.xml || true
 	"$( os::util::find::built_binary junitmerge )" "${TEST_REPORT_DIR}"/*.xml > "${output}"
 	rm "${TEST_REPORT_DIR}"/*.xml
 	mv "${output}" "${TEST_REPORT_DIR}/junit.xml"