@@ -629,7 +629,7 @@ def post(output_name) {
629
629
tools : [Custom (customXSL : " $WORKSPACE /openjdk-tests/jck/xUnit.xsl" ,
630
630
deleteOutputFiles : true ,
631
631
failIfNotNew : true ,
632
- pattern : " **/TKG/test_output_ */**/report.xml" ,
632
+ pattern : " **/TKG/output_ */**/report.xml" ,
633
633
skipNoTestFiles : true ,
634
634
stopProcessingIfError : true )]
635
635
)
@@ -638,28 +638,28 @@ def post(output_name) {
638
638
if ((currentBuild. result == ' UNSTABLE' || currentBuild. result == ' FAILURE' || currentBuild. result == ' ABORTED' ) || params. ARCHIVE_TEST_RESULTS ) {
639
639
def test_output_tar_name = " ${ output_name} _test_output${ suffix} "
640
640
if (tar_cmd. startsWith(' tar' )) {
641
- sh " ${ tar_cmd} - ${ pax_opt} ./openjdk-tests/TKG/test_output_ * ${ tar_cmd_suffix} > ${ test_output_tar_name} "
641
+ sh " ${ tar_cmd} - ${ pax_opt} ./openjdk-tests/TKG/output_ * ${ tar_cmd_suffix} > ${ test_output_tar_name} "
642
642
} else {
643
- sh " ${ tar_cmd} ${ test_output_tar_name} ${ pax_opt} ./openjdk-tests/TKG/test_output_ * ${ tar_cmd_suffix} "
643
+ sh " ${ tar_cmd} ${ test_output_tar_name} ${ pax_opt} ./openjdk-tests/TKG/output_ * ${ tar_cmd_suffix} "
644
644
}
645
645
646
646
if (! params. ARTIFACTORY_SERVER ) {
647
647
echo " ARTIFACTORY_SERVER is not set. Saving artifacts on jenkins."
648
648
archiveArtifacts artifacts : test_output_tar_name, fingerprint : true , allowEmptyArchive : true
649
649
} else {
650
- def pattern = " ${ env.WORKSPACE} /*_test_output .*"
650
+ def pattern = " ${ env.WORKSPACE} /*_output .*"
651
651
uploadToArtifactory(pattern)
652
652
}
653
653
}
654
654
// for performance test, archive regardless the build result
655
655
if (env. BUILD_LIST . startsWith(' perf' )) {
656
656
def benchmark_output_tar_name = " benchmark_test_output${ suffix} "
657
- sh " ${ tar_cmd} ${ benchmark_output_tar_name} ${ pax_opt} ./openjdk-tests/TKG/test_output_ *"
657
+ sh " ${ tar_cmd} ${ benchmark_output_tar_name} ${ pax_opt} ./openjdk-tests/TKG/output_ *"
658
658
if (! params. ARTIFACTORY_SERVER ) {
659
659
echo " ARTIFACTORY_SERVER is not set. Saving artifacts on jenkins."
660
660
archiveArtifacts artifacts : benchmark_output_tar_name, fingerprint : true , allowEmptyArchive : true
661
661
} else {
662
- def pattern = " ${ env.WORKSPACE} /*_test_output .*"
662
+ def pattern = " ${ env.WORKSPACE} /*_output .*"
663
663
uploadToArtifactory(pattern)
664
664
}
665
665
}
0 commit comments