Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added logic to save JUNIT log with ENV vars #11996

Merged
merged 1 commit into from
Nov 30, 2016
Merged

Added logic to save JUNIT log with ENV vars #11996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion test/extended/alternate_certs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,28 @@ export EXTENDED_TEST_PATH="${OS_ROOT}/test/extended"
function cleanup()
{
out=$?
kill $OS_PID
kill $OS_PID

# TODO(skuznets): un-hack this nonsense once traps are in a better state
if [[ -n "${JUNIT_REPORT_OUTPUT:-}" ]]; then
# get the jUnit output file into a workable state in case we crashed in
# the middle of testing something
os::test::junit::reconcile_output

# check that we didn't mangle jUnit output
os::test::junit::check_test_counters

# use the junitreport tool to generate us a report
os::util::ensure::built_binary_exists 'junitreport'

cat "${JUNIT_REPORT_OUTPUT}" "${junit_gssapi_output}" \
| junitreport --type oscmd \
--suites nested \
--roots github.com/openshift/origin \
--output "${ARTIFACT_DIR}/report.xml"
cat "${ARTIFACT_DIR}/report.xml" | junitreport summarize
fi

os::log::info "Exiting"
exit $out
}
Expand All @@ -25,6 +46,11 @@ os::log::info "Server logs will be at: ${LOG_DIR}/openshift.log"
os::log::info "Test artifacts will be in: ${ARTIFACT_DIR}"
os::log::info "Config dir is: ${SERVER_CONFIG_DIR}"

# Allow setting $JUNIT_REPORT to toggle output behavior
if [[ -n "${JUNIT_REPORT:-}" ]]; then
export JUNIT_REPORT_OUTPUT="${LOG_DIR}/raw_test_output.log"
fi

mkdir -p ${LOG_DIR}

os::log::info "Scan of OpenShift related processes already up via ps -ef | grep openshift : "
Expand Down
28 changes: 27 additions & 1 deletion test/extended/alternate_launches.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,29 @@ export EXTENDED_TEST_PATH="${OS_ROOT}/test/extended"
function cleanup()
{
out=$?
pgrep -f "openshift" | xargs -r sudo kill
pgrep -f "openshift" | xargs -r sudo kill
cleanup_openshift

# TODO(skuznets): un-hack this nonsense once traps are in a better state
if [[ -n "${JUNIT_REPORT_OUTPUT:-}" ]]; then
# get the jUnit output file into a workable state in case we crashed in
# the middle of testing something
os::test::junit::reconcile_output

# check that we didn't mangle jUnit output
os::test::junit::check_test_counters

# use the junitreport tool to generate us a report
os::util::ensure::built_binary_exists 'junitreport'

cat "${JUNIT_REPORT_OUTPUT}" "${junit_gssapi_output}" \
| junitreport --type oscmd \
--suites nested \
--roots github.com/openshift/origin \
--output "${ARTIFACT_DIR}/report.xml"
cat "${ARTIFACT_DIR}/report.xml" | junitreport summarize
fi

os::log::info "Exiting"
exit $out
}
Expand All @@ -33,6 +54,11 @@ os::log::info "Config dir is: ${SERVER_CONFIG_DIR}"
os::log::info "Using images: ${USE_IMAGES}"
os::log::info "MasterIP is: ${MASTER_ADDR}"

# Allow setting $JUNIT_REPORT to toggle output behavior
if [[ -n "${JUNIT_REPORT:-}" ]]; then
export JUNIT_REPORT_OUTPUT="${LOG_DIR}/raw_test_output.log"
fi

mkdir -p ${LOG_DIR}

os::log::info "Scan of OpenShift related processes already up via ps -ef | grep openshift : "
Expand Down
26 changes: 26 additions & 0 deletions test/extended/cmd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,27 @@ function cleanup()
out=$?
docker rmi test/scratchimage
cleanup_openshift

# TODO(skuznets): un-hack this nonsense once traps are in a better state
if [[ -n "${JUNIT_REPORT_OUTPUT:-}" ]]; then
# get the jUnit output file into a workable state in case we crashed in
# the middle of testing something
os::test::junit::reconcile_output

# check that we didn't mangle jUnit output
os::test::junit::check_test_counters

# use the junitreport tool to generate us a report
os::util::ensure::built_binary_exists 'junitreport'

cat "${JUNIT_REPORT_OUTPUT}" "${junit_gssapi_output}" \
| junitreport --type oscmd \
--suites nested \
--roots github.com/openshift/origin \
--output "${ARTIFACT_DIR}/report.xml"
cat "${ARTIFACT_DIR}/report.xml" | junitreport summarize
fi

os::log::info "Exiting"
return "${out}"
}
Expand All @@ -31,6 +52,11 @@ os::log::system::start
os::start::configure_server
os::start::server

# Allow setting $JUNIT_REPORT to toggle output behavior
if [[ -n "${JUNIT_REPORT:-}" ]]; then
export JUNIT_REPORT_OUTPUT="${LOG_DIR}/raw_test_output.log"
fi

export KUBECONFIG="${ADMIN_KUBECONFIG}"

oc login -u system:admin -n default
Expand Down
8 changes: 5 additions & 3 deletions test/extended/gssapi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ os::log::system::start

os::util::ensure::iptables_privileges_exist

# TODO(skuznets): Fix vagrant openshift so env vars can be passed to this script
JUNIT_REPORT=true

# Allow setting $JUNIT_REPORT to toggle output behavior
if [[ -n "${JUNIT_REPORT:-}" ]]; then
export JUNIT_REPORT_OUTPUT="${LOG_DIR}/raw_test_output.log"
Expand Down Expand Up @@ -77,6 +74,11 @@ cp "${SERVER_CONFIG_DIR}/master/master-config.yaml" "${SERVER_CONFIG_DIR}/master
openshift ex config patch "${SERVER_CONFIG_DIR}/master/master-config.tmp.yaml" --patch="${oauth_patch}" > "${SERVER_CONFIG_DIR}/master/master-config.yaml"
os::start::server

# Allow setting $JUNIT_REPORT to toggle output behavior
if [[ -n "${JUNIT_REPORT:-}" ]]; then
export JUNIT_REPORT_OUTPUT="${LOG_DIR}/raw_test_output.log"
fi

export KUBECONFIG="${ADMIN_KUBECONFIG}"

os::start::registry
Expand Down
26 changes: 26 additions & 0 deletions test/extended/ldap_groups.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,27 @@ function cleanup()
{
out=$?
cleanup_openshift

# TODO(skuznets): un-hack this nonsense once traps are in a better state
if [[ -n "${JUNIT_REPORT_OUTPUT:-}" ]]; then
# get the jUnit output file into a workable state in case we crashed in
# the middle of testing something
os::test::junit::reconcile_output

# check that we didn't mangle jUnit output
os::test::junit::check_test_counters

# use the junitreport tool to generate us a report
os::util::ensure::built_binary_exists 'junitreport'

cat "${JUNIT_REPORT_OUTPUT}" "${junit_gssapi_output}" \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extended run is failing with this:

test/extended/ldap_groups.sh: line 28: junit_gssapi_output: unbound variable

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in master.

| junitreport --type oscmd \
--suites nested \
--roots github.com/openshift/origin \
--output "${ARTIFACT_DIR}/report.xml"
cat "${ARTIFACT_DIR}/report.xml" | junitreport summarize
fi

os::log::info "Exiting"
return $out
}
Expand All @@ -30,6 +51,11 @@ os::log::system::start
os::start::configure_server
os::start::server

# Allow setting $JUNIT_REPORT to toggle output behavior
if [[ -n "${JUNIT_REPORT:-}" ]]; then
export JUNIT_REPORT_OUTPUT="${LOG_DIR}/raw_test_output.log"
fi

export KUBECONFIG="${ADMIN_KUBECONFIG}"

os::start::registry
Expand Down
27 changes: 27 additions & 0 deletions test/extended/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,28 @@ function os::test::extended::setup () {
function cleanup() {
out=$?
cleanup_openshift

# TODO(skuznets): un-hack this nonsense once traps are in a better
# state
if [[ -n "${JUNIT_REPORT_OUTPUT:-}" ]]; then
# get the jUnit output file into a workable state in case we
# crashed in the middle of testing something
os::test::junit::reconcile_output

# check that we didn't mangle jUnit output
os::test::junit::check_test_counters

# use the junitreport tool to generate us a report
os::util::ensure::built_binary_exists 'junitreport'

cat "${JUNIT_REPORT_OUTPUT}" "${junit_gssapi_output}" \
| junitreport --type oscmd \
--suites nested \
--roots github.com/openshift/origin \
--output "${ARTIFACT_DIR}/report.xml"
cat "${ARTIFACT_DIR}/report.xml" | junitreport summarize
fi

os::log::info "Exiting"
return $out
}
Expand All @@ -66,6 +88,11 @@ function os::test::extended::setup () {
os::log::warn "/mnt/openshift-xfs-vol-dir does not exist, local storage quota tests may fail."
fi

# Allow setting $JUNIT_REPORT to toggle output behavior
if [[ -n "${JUNIT_REPORT:-}" ]]; then
export JUNIT_REPORT_OUTPUT="${LOG_DIR}/raw_test_output.log"
fi

os::log::system::start

if [[ -n "${SHOW_ALL:-}" ]]; then
Expand Down