Repository: oozie Updated Branches: refs/heads/master 268a09f92 -> 25a275c71
OOZIE-3106 amend upgrade surefire-plugin to 2.20.1 (dbist13 via asasvari) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/25a275c7 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/25a275c7 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/25a275c7 Branch: refs/heads/master Commit: 25a275c717c3db8616b971396cc6aac7bd8fdbba Parents: 268a09f Author: Attila Sasvari <asasv...@cloudera.com> Authored: Mon Nov 20 11:59:19 2017 +0100 Committer: Attila Sasvari <asasv...@cloudera.com> Committed: Mon Nov 20 11:59:19 2017 +0100 ---------------------------------------------------------------------- bin/test-patch-20-tests | 8 ++++---- release-log.txt | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/25a275c7/bin/test-patch-20-tests ---------------------------------------------------------------------- diff --git a/bin/test-patch-20-tests b/bin/test-patch-20-tests index f03c1a7..e076b96 100755 --- a/bin/test-patch-20-tests +++ b/bin/test-patch-20-tests @@ -107,13 +107,13 @@ case $OP in report) failedTests=$(find . -name '*\.txt' | grep target/surefire-reports | xargs grep "<<< FAILURE" | grep -v "Tests run:" | sed 's/.*\.txt\://' | sed 's/ .*//') testsWithError=$(find . -name '*\.txt' | grep target/surefire-reports | xargs grep "<<< ERROR" | grep -v "Tests run:" | sed 's/.*\.txt\://' | sed 's/ .*//') - testsRun=$(grep "Tests run:" ${TEMPDIR}/${TASKNAME}.out | grep -v " Time elapsed:" | awk '{print $3}' | sed 's/,//' | awk 'BEGIN {count=0} {count=count+$1} END {print count}') - testsFailed=$(grep "Tests run:" ${TEMPDIR}/${TASKNAME}.rerun.out | grep -v " Time elapsed:" | awk '{print $5}' | sed 's/,//' | awk 'BEGIN {count=0} {count=count+$1} END {print count}') - testsErrors=$(grep "Tests run:" ${TEMPDIR}/${TASKNAME}.rerun.out | grep -v " Time elapsed:" | awk '{print $7}' | sed 's/,//' | awk 'BEGIN {count=0} {count=count+$1} END {print count}') + testsRun=$(grep "Tests run:" ${TEMPDIR}/${TASKNAME}.out | grep -v " Time elapsed:" | awk '{print $4}' | sed 's/,//' | awk 'BEGIN {count=0} {count=count+$1} END {print count}') + testsFailed=$(grep "Tests run:" ${TEMPDIR}/${TASKNAME}.rerun.out | grep -v " Time elapsed:" | awk '{print $6}' | sed 's/,//' | awk 'BEGIN {count=0} {count=count+$1} END {print count}') + testsErrors=$(grep "Tests run:" ${TEMPDIR}/${TASKNAME}.rerun.out | grep -v " Time elapsed:" | awk '{print $8}' | sed 's/,//' | awk 'BEGIN {count=0} {count=count+$1} END {print count}') hasFailures=$(expr $testsFailed + $testsErrors) testsExitCode=$(cat ${TEMPDIR}/${TASKNAME}.exitCode) flakyTests=$(cat ${TEMPDIR}/${TASKNAME}.flakies.out) - testsReRun=$(grep "Tests run:" ${TEMPDIR}/${TASKNAME}.rerun.out | grep -v " Time elapsed:" | awk '{print $3}' | sed 's/,//' | awk 'BEGIN {count=0} {count=count+$1} END {print count}') + testsReRun=$(grep "Tests run:" ${TEMPDIR}/${TASKNAME}.rerun.out | grep -v " Time elapsed:" | awk '{print $4}' | sed 's/,//' | awk 'BEGIN {count=0} {count=count+$1} END {print count}') if [[ $hasFailures != 0 ]] ; then echo "{color:red}-1 ${TASKNAME}{color}" >> $SUMMARYFILE echo ". Tests run: $testsRun" >> $SUMMARYFILE http://git-wip-us.apache.org/repos/asf/oozie/blob/25a275c7/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 04b04f3..c0eab68 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-3106 amend upgrade surefire-plugin to 2.20.1 (dbist13 via asasvari) OOZIE-2869 Ability to add/remove MapReduce jars from action classpath (gezapeti) OOZIE-2296 Add an Oozie diagnostic bundle tool (asasvari) OOZIE-3125 TestDBLoadDump.testImportInvalidDataLeavesTablesEmpty fails (asasvari)