Skip to content

Commit a059244

Browse files
authored
Shorten test_output folder name to output (#2118)
Signed-off-by: renfeiw <renfeiw@ca.ibm.com>
1 parent 3ebf18e commit a059244

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

.github/workflows/PushOrPRtestbuild.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
- uses: actions/upload-artifact@v2
5757
if: failure()
5858
with:
59-
name: test_output_openjdk
60-
path: ./**/test_output_*/
59+
name: output_openjdk
60+
path: ./**/output_*/
6161
testSystemWithOpenj9:
6262
runs-on: ${{ matrix.os }}
6363
strategy:
@@ -94,5 +94,5 @@ jobs:
9494
- uses: actions/upload-artifact@v2
9595
if: failure()
9696
with:
97-
name: test_output_system
98-
path: ./**/test_output_*/
97+
name: output_system
98+
path: ./**/output_*/

.github/workflows/actionExample.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ jobs:
4747
# - uses: actions/upload-artifact@v2-preview
4848
# if: failure()
4949
# with:
50-
# name: test_output
51-
# path: ./**/test_output_*/
50+
# name: output
51+
# path: ./**/output_*/
5252

5353
###########################################################################
5454
#

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# misc auto generated folders
55
bin
66
!perf/liberty/scripts/bin
7-
test_output_*
87

98
# misc auto generated files
109
autoGen.mk

buildenv/jenkins/JenkinsfileBase

+6-6
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ def post(output_name) {
629629
tools: [Custom(customXSL: "$WORKSPACE/openjdk-tests/jck/xUnit.xsl",
630630
deleteOutputFiles: true,
631631
failIfNotNew: true,
632-
pattern: "**/TKG/test_output_*/**/report.xml",
632+
pattern: "**/TKG/output_*/**/report.xml",
633633
skipNoTestFiles: true,
634634
stopProcessingIfError: true)]
635635
)
@@ -638,28 +638,28 @@ def post(output_name) {
638638
if ((currentBuild.result == 'UNSTABLE' || currentBuild.result == 'FAILURE' || currentBuild.result == 'ABORTED') || params.ARCHIVE_TEST_RESULTS) {
639639
def test_output_tar_name = "${output_name}_test_output${suffix}"
640640
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}"
642642
} 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}"
644644
}
645645

646646
if (!params.ARTIFACTORY_SERVER) {
647647
echo "ARTIFACTORY_SERVER is not set. Saving artifacts on jenkins."
648648
archiveArtifacts artifacts: test_output_tar_name, fingerprint: true, allowEmptyArchive: true
649649
} else {
650-
def pattern = "${env.WORKSPACE}/*_test_output.*"
650+
def pattern = "${env.WORKSPACE}/*_output.*"
651651
uploadToArtifactory(pattern)
652652
}
653653
}
654654
//for performance test, archive regardless the build result
655655
if (env.BUILD_LIST.startsWith('perf')) {
656656
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_*"
658658
if (!params.ARTIFACTORY_SERVER) {
659659
echo "ARTIFACTORY_SERVER is not set. Saving artifacts on jenkins."
660660
archiveArtifacts artifacts: benchmark_output_tar_name, fingerprint: true, allowEmptyArchive: true
661661
} else {
662-
def pattern = "${env.WORKSPACE}/*_test_output.*"
662+
def pattern = "${env.WORKSPACE}/*_output.*"
663663
uploadToArtifactory(pattern)
664664
}
665665
}

doc/userGuide.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ _sanity.openjdk done
303303
Additional test output can be found in the following folders:
304304

305305
```
306-
openjdk-tests/test-results/openjdk/TKG/test_output_<timestamp>`
306+
openjdk-tests/test-results/openjdk/TKG/output_<timestamp>`
307307
openjdk-tests/test-results/openjdk/work
308308
openjdk-tests/test-results/openjdk/report
309309
```

0 commit comments

Comments
 (0)