Skip to content

Commit

Permalink
Revert "Disable junit archiving (#271)"
Browse files Browse the repository at this point in the history 
The issue that motivated the initial commit was fixed.

This reverts commit 72c2e39.
  • Loading branch information
@felipepiovezan
felipepiovezan committed Oct 28, 2024
1 parent a4639a9 commit cca5750
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 33 deletions.
3 changes: 1 addition & 2 deletions zorg/jenkins/jobs/jobs/clang-san-iossim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ pipeline {
post {
always {
script {
// junit 'clang-build/**/testresults-*.xunit.xml'
echo "Temporarily Skip Junit"
junit 'clang-build/**/testresults-*.xunit.xml'
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions zorg/jenkins/jobs/jobs/clang-stage1-RA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ pipeline {
post {
always {
script {
// junit "clang-build/**/testresults.xunit.xml"
echo "Temporarily Skip Junit"
junit "clang-build/**/testresults.xunit.xml"
}
}
}
Expand Down
9 changes: 4 additions & 5 deletions zorg/jenkins/jobs/jobs/clang-stage1-RA-expensive
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,10 @@ pipeline {
// ToDo: Restore the issue scanner
// scanForIssues tool: clang()

// junit allowEmptyResults: true, testResults: "clang-build/**/testresults.xunit.xml"
// junit allowEmptyResults: true, testResults: "clang-build/asan-IOSSimX86_64Config.xunit.xml"
// junit allowEmptyResults: true, testResults: "clang-build/asan-IOSSimI386Config.xunit.xml"
// junit allowEmptyResults: true, testResults: "clang-build/tsan-IOSSimX86_64Config.xunit.xml"
echo "Temporarily Skip Junit"
junit allowEmptyResults: true, testResults: "clang-build/**/testresults.xunit.xml"
junit allowEmptyResults: true, testResults: "clang-build/asan-IOSSimX86_64Config.xunit.xml"
junit allowEmptyResults: true, testResults: "clang-build/asan-IOSSimI386Config.xunit.xml"
junit allowEmptyResults: true, testResults: "clang-build/tsan-IOSSimX86_64Config.xunit.xml"

sh "rm -rf clang-build clang-install host-compiler *.tar.gz"
}
Expand Down
3 changes: 1 addition & 2 deletions zorg/jenkins/jobs/jobs/clang-stage1-cmake-RA-incremental
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ pipeline {
post {
always {
script {
// junit "clang-build/**/testresults.xunit.xml"
echo "Temporarily Skip Junit"
junit "clang-build/**/testresults.xunit.xml"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions zorg/jenkins/jobs/jobs/clang-stage2-Rthinlto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,7 @@ pipeline {
post {
always {
script {
// junit "clang-build/**/testresults.xunit.xml"
echo "Temporarily Skip Junit"
junit "clang-build/**/testresults.xunit.xml"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgSan
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@ pipeline {
post {
always {
script {
// junit "clang-build/**/testresults.xunit.xml"
echo "Temporarily Skip Junit"
junit "clang-build/**/testresults.xunit.xml"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions zorg/jenkins/jobs/jobs/lldb-cmake-as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,7 @@ pipeline {
always {
// ToDo: Restore the issue scanner
// scanForIssues tool: clang()
// junit 'test/results.xml'
echo "Temporarily Skip Junit"
junit 'test/results.xml'
}
}
}
3 changes: 1 addition & 2 deletions zorg/jenkins/jobs/jobs/lldb-cmake-intel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,7 @@ pipeline {
always {
// ToDo: Restore the issue scanner
// scanForIssues tool: clang()
// junit 'test/results.xml'
echo "Temporarily Skip Junit"
junit 'test/results.xml'
}
}
}
15 changes: 5 additions & 10 deletions zorg/jenkins/jobs/jobs/lldb-cmake-matrix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,7 @@ pipeline {
python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test || echo "** check-lldb failed with errors"
'''
}
// junit 'test/results.xml'
echo "Temporarily Skip Junit"
junit 'test/results.xml'
}
}
stage('Test DWARF4') {
Expand Down Expand Up @@ -166,8 +165,7 @@ pipeline {
python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test || echo "** check-lldb failed with errors"
'''
}
// junit 'test/results.xml'
echo "Temporarily Skip Junit"
junit 'test/results.xml'
}
}
stage('Test DWARF5') {
Expand Down Expand Up @@ -199,8 +197,7 @@ pipeline {
python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test || echo "** check-lldb failed with errors"
'''
}
// junit 'test/results.xml'
echo "Temporarily Skip Junit"
junit 'test/results.xml'
}
}
stage('Build Clang 15.0.1') {
Expand Down Expand Up @@ -265,8 +262,7 @@ pipeline {
python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test || echo "** check-lldb failed with errors"
'''
}
// junit 'test/results.xml'
echo "Temporarily Skip Junit"
junit 'test/results.xml'
}
}
stage('Build Clang 17.0.6') {
Expand Down Expand Up @@ -333,8 +329,7 @@ pipeline {
python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test || echo "** check-lldb failed with errors"
'''
}
// junit 'test/results.xml'
echo "Temporarily Skip Junit"
junit 'test/results.xml'
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions zorg/jenkins/jobs/jobs/lldb-cmake-sanitized
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@ pipeline {
always {
// ToDo: Restore issue scanner
// scanForIssues tool: clang()
// junit 'test/results.xml'
echo "Temporarily Skip Junit"
junit 'test/results.xml'
}
}
}
3 changes: 1 addition & 2 deletions zorg/jenkins/jobs/jobs/llvm-coverage
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,7 @@ pipeline {
always {
// ToDo: Restore issue scanner
//scanForIssues tool: clang()
// junit 'test/results.xml'
echo "Temporarily Skip Junit"
junit 'test/results.xml'
}
success {
script {
Expand Down

0 comments on commit cca5750

Please sign in to comment.