Merge pull request #12096 from oatmealraisin/rymurphy/test_extended_fix

Merged by openshift-bot

Author: OpenShift Bot

test/extended/alternate_certs.sh

@@ -24,7 +24,7 @@ function cleanup()
 		# use the junitreport tool to generate us a report
 		os::util::ensure::built_binary_exists 'junitreport'
 
-		cat "${JUNIT_REPORT_OUTPUT}" "${junit_gssapi_output}" \
+		cat "${JUNIT_REPORT_OUTPUT}" \
 			| junitreport --type oscmd \
 			--suites nested \
 			--roots github.com/openshift/origin \

test/extended/alternate_launches.sh

@@ -27,7 +27,7 @@ function cleanup()
 		# use the junitreport tool to generate us a report
 		os::util::ensure::built_binary_exists 'junitreport'
 
-		cat "${JUNIT_REPORT_OUTPUT}" "${junit_gssapi_output}" \
+		cat "${JUNIT_REPORT_OUTPUT}" \
 			| junitreport --type oscmd \
 			--suites nested \
 			--roots github.com/openshift/origin \

test/extended/cmd.sh

@@ -27,7 +27,7 @@ function cleanup()
 		# use the junitreport tool to generate us a report
 		os::util::ensure::built_binary_exists 'junitreport'
 
-		cat "${JUNIT_REPORT_OUTPUT}" "${junit_gssapi_output}" \
+		cat "${JUNIT_REPORT_OUTPUT}" \
 			| junitreport --type oscmd \
 			--suites nested \
 			--roots github.com/openshift/origin \

test/extended/ldap_groups.sh

@@ -25,7 +25,7 @@ function cleanup()
 		# use the junitreport tool to generate us a report
 		os::util::ensure::built_binary_exists 'junitreport'
 
-		cat "${JUNIT_REPORT_OUTPUT}" "${junit_gssapi_output}" \
+		cat "${JUNIT_REPORT_OUTPUT}" \
 			| junitreport --type oscmd \
 			--suites nested \
 			--roots github.com/openshift/origin \

test/extended/setup.sh

@@ -57,7 +57,7 @@ function os::test::extended::setup () {
 				# use the junitreport tool to generate us a report
 				os::util::ensure::built_binary_exists 'junitreport'
 
-				cat "${JUNIT_REPORT_OUTPUT}" "${junit_gssapi_output}" \
+				cat "${JUNIT_REPORT_OUTPUT}" \
 					| junitreport --type oscmd \
 					--suites nested \
 					--roots github.com/openshift/origin \