diff --git a/Jenkinsfile b/Jenkinsfile index d5f09816ba..65ec2db91e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -319,6 +319,11 @@ pipeline { exit $c ''' } + post { + always { + junit testResults: 'bundles/**/*-report.xml', allowEmptyResults: true + } + } } } @@ -339,7 +344,7 @@ pipeline { bundleName=amd64 echo "Creating ${bundleName}-bundles.tar.gz" # exclude overlay2 directories - find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz + find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*-report.json' -o -name '*.log' -o -name '*.prof' -o -name '*-report.xml' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz ''' archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true @@ -416,6 +421,11 @@ pipeline { test-integration ''' } + post { + always { + junit testResults: 'bundles/**/*-report.xml', allowEmptyResults: true + } + } } } @@ -436,7 +446,7 @@ pipeline { bundleName=s390x-integration echo "Creating ${bundleName}-bundles.tar.gz" # exclude overlay2 directories - find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz + find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*-report.json' -o -name '*.log' -o -name '*.prof' -o -name '*-report.xml' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz ''' archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true @@ -494,6 +504,11 @@ pipeline { test-integration ''' } + post { + always { + junit testResults: 'bundles/**/*-report.xml', allowEmptyResults: true + } + } } } @@ -514,7 +529,7 @@ pipeline { bundleName=s390x-integration-cli echo "Creating ${bundleName}-bundles.tar.gz" # exclude overlay2 directories - find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz + find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*-report.json' -o -name '*.log' -o -name '*.prof' -o -name '*-report.xml' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz ''' archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true @@ -589,6 +604,11 @@ pipeline { test-integration ''' } + post { + always { + junit testResults: 'bundles/**/*-report.xml', allowEmptyResults: true + } + } } } @@ -609,7 +629,7 @@ pipeline { bundleName=ppc64le-integration echo "Creating ${bundleName}-bundles.tar.gz" # exclude overlay2 directories - find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz + find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*-report.json' -o -name '*.log' -o -name '*.prof' -o -name '*-report.xml' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz ''' archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true @@ -665,6 +685,11 @@ pipeline { test-integration ''' } + post { + always { + junit testResults: 'bundles/**/*-report.xml', allowEmptyResults: true + } + } } } @@ -685,7 +710,7 @@ pipeline { bundleName=ppc64le-integration-cli echo "Creating ${bundleName}-bundles.tar.gz" # exclude overlay2 directories - find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz + find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*-report.json' -o -name '*.log' -o -name '*.prof' -o -name '*-report.xml' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz ''' archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true diff --git a/hack/make/.integration-test-helpers b/hack/make/.integration-test-helpers index 76101bbefe..69b2744036 100644 --- a/hack/make/.integration-test-helpers +++ b/hack/make/.integration-test-helpers @@ -60,8 +60,14 @@ run_test_integration_suites() { if ! ( cd "$dir" echo "Running $PWD flags=${flags}" + [ -n "$TESTDEBUG" ] && set -x # shellcheck disable=SC2086 - test_env ./test.main ${flags} + test_env gotestsum \ + --format=standard-verbose \ + --jsonfile="${ABS_DEST}/$(basename "$dir")-go-test-report.json" \ + --junitfile="${ABS_DEST}/$(basename "$dir")-junit-report.xml" \ + --raw-command \ + -- go tool test2json ./test.main ${flags} ); then exit 1; fi done }