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.

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

Merge JUnit results from extended suites #12357

Merged
merged 1 commit into from
Dec 29, 2016

Conversation

smarterclayton
Copy link
Contributor

Ensures that Jenkins does not double count skips until jenkinsci/junit-plugin#54 is merged

@smarterclayton
Copy link
Contributor Author

[test]

@smarterclayton smarterclayton force-pushed the merge_junit branch 3 times, most recently from 4e970a1 to f8178c6 Compare December 28, 2016 23:12
Jenkins JUnit does not handle skips in different files that have the
same name, leading to invalid results. Merge all the JUnit output files
into one by suite and test name. Failures override Successes, both
override Skips.
@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 919c521

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/12616/) (Base Commit: d076366)

@smarterclayton
Copy link
Contributor Author

[merge] only flakes now

}
}

func main() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not junitreport merge a la junitreport summarize?

@@ -34,4 +34,6 @@ os::log::info ""
os::log::info "Running serial tests"
FOCUS="${sf}" SKIP="${ss}" TEST_REPORT_FILE_NAME=core_serial os::test::extended::run -- -ginkgo.noColor -ginkgo.v -test.timeout 2h ${TEST_EXTENDED_ARGS-} || exitstatus=$?

os::test::extended::merge_junit
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this be trapped so it runs on failure?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

we already trap exit code

@@ -27,6 +27,7 @@ function os::test::extended::setup () {
os::util::ensure::built_binary_exists 'openshift'
os::util::ensure::built_binary_exists 'oadm'
os::util::ensure::built_binary_exists 'oc'
os::util::ensure::built_binary_exists 'junitmerge' 'tools/junitmerge'
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't need to specify the path for this, it looks into tools/

Copy link
Contributor Author

Choose a reason for hiding this comment

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

will do in a follow up

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 919c521

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 29, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/12617/) (Base Commit: d076366) (Image: devenv-rhel7_5609)

@openshift-bot openshift-bot merged commit 71d3fa9 into openshift:master Dec 29, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants