Revert "Disable junit archiving (llvm#271)"

felipepiovezan · felipepiovezan · commit cca5750635fe · 2024-10-28T08:37:14.000-07:00
The issue that motivated the initial commit was fixed. This reverts commit 72c2e39.
diff --git a/zorg/jenkins/jobs/jobs/clang-san-iossim b/zorg/jenkins/jobs/jobs/clang-san-iossim
@@ -109,8 +109,7 @@ pipeline {
             post {
                 always {
                     script {
-                        // junit 'clang-build/**/testresults-*.xunit.xml'
-                        echo "Temporarily Skip Junit"
+                        junit 'clang-build/**/testresults-*.xunit.xml'
                     }
                 }
             }
diff --git a/zorg/jenkins/jobs/jobs/clang-stage1-RA b/zorg/jenkins/jobs/jobs/clang-stage1-RA
@@ -114,8 +114,7 @@ pipeline {
             post {
                 always {
                     script {
-                        // junit "clang-build/**/testresults.xunit.xml"
-                        echo "Temporarily Skip Junit"
+                        junit "clang-build/**/testresults.xunit.xml"
                     }
                 }
             }
diff --git a/zorg/jenkins/jobs/jobs/clang-stage1-RA-expensive b/zorg/jenkins/jobs/jobs/clang-stage1-RA-expensive
@@ -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"
             }
diff --git a/zorg/jenkins/jobs/jobs/clang-stage1-cmake-RA-incremental b/zorg/jenkins/jobs/jobs/clang-stage1-cmake-RA-incremental
@@ -106,8 +106,7 @@ pipeline {
             post {
                 always {
                     script {
-                        // junit "clang-build/**/testresults.xunit.xml"
-                        echo "Temporarily Skip Junit"
+                        junit "clang-build/**/testresults.xunit.xml"
                     }
                 }
             }
diff --git a/zorg/jenkins/jobs/jobs/clang-stage2-Rthinlto b/zorg/jenkins/jobs/jobs/clang-stage2-Rthinlto
@@ -129,8 +129,7 @@ pipeline {
             post {
                 always {
                     script {
-                        // junit "clang-build/**/testresults.xunit.xml"
-                        echo "Temporarily Skip Junit"
+                        junit "clang-build/**/testresults.xunit.xml"
                     }
                 }
             }
diff --git a/zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgSan b/zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgSan
@@ -125,8 +125,7 @@ pipeline {
             post {
                 always {
                     script {
-                        // junit "clang-build/**/testresults.xunit.xml"
-                        echo "Temporarily Skip Junit"
+                        junit "clang-build/**/testresults.xunit.xml"
                     }
                 }
             }
diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-as b/zorg/jenkins/jobs/jobs/lldb-cmake-as
@@ -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'
         }
     }
 }
diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-intel b/zorg/jenkins/jobs/jobs/lldb-cmake-intel
@@ -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'
         }
     }
 }
diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-matrix b/zorg/jenkins/jobs/jobs/lldb-cmake-matrix
@@ -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') {
@@ -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') {
@@ -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') {
@@ -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') {
@@ -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'
             }
         }
     }
diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-sanitized b/zorg/jenkins/jobs/jobs/lldb-cmake-sanitized
@@ -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'
         }
     }
 }
diff --git a/zorg/jenkins/jobs/jobs/llvm-coverage b/zorg/jenkins/jobs/jobs/llvm-coverage
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,7 @@ pipeline {`
`109`	`109`	`post {`
`110`	`110`	`always {`
`111`	`111`	`script {`
`112`		`- // junit 'clang-build/*/testresults-.xunit.xml'`
`113`		`- echo "Temporarily Skip Junit"`
	`112`	`+ junit 'clang-build/*/testresults-.xunit.xml'`
`114`	`113`	`}`
`115`	`114`	`}`
`116`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,7 @@ pipeline {`
`114`	`114`	`post {`
`115`	`115`	`always {`
`116`	`116`	`script {`
`117`		`- // junit "clang-build/**/testresults.xunit.xml"`
`118`		`- echo "Temporarily Skip Junit"`
	`117`	`+ junit "clang-build/**/testresults.xunit.xml"`
`119`	`118`	`}`
`120`	`119`	`}`
`121`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,7 @@ pipeline {`
`106`	`106`	`post {`
`107`	`107`	`always {`
`108`	`108`	`script {`
`109`		`- // junit "clang-build/**/testresults.xunit.xml"`
`110`		`- echo "Temporarily Skip Junit"`
	`109`	`+ junit "clang-build/**/testresults.xunit.xml"`
`111`	`110`	`}`
`112`	`111`	`}`
`113`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,7 @@ pipeline {`
`129`	`129`	`post {`
`130`	`130`	`always {`
`131`	`131`	`script {`
`132`		`- // junit "clang-build/**/testresults.xunit.xml"`
`133`		`- echo "Temporarily Skip Junit"`
	`132`	`+ junit "clang-build/**/testresults.xunit.xml"`
`134`	`133`	`}`
`135`	`134`	`}`
`136`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,7 @@ pipeline {`
`125`	`125`	`post {`
`126`	`126`	`always {`
`127`	`127`	`script {`
`128`		`- // junit "clang-build/**/testresults.xunit.xml"`
`129`		`- echo "Temporarily Skip Junit"`
	`128`	`+ junit "clang-build/**/testresults.xunit.xml"`
`130`	`129`	`}`
`131`	`130`	`}`
`132`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,8 +189,7 @@ pipeline {`
`189`	`189`	`always {`
`190`	`190`	`// ToDo: Restore the issue scanner`
`191`	`191`	`// scanForIssues tool: clang()`
`192`		`- // junit 'test/results.xml'`
`193`		`- echo "Temporarily Skip Junit"`
	`192`	`+ junit 'test/results.xml'`
`194`	`193`	`}`
`195`	`194`	`}`
`196`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,8 +202,7 @@ pipeline {`
`202`	`202`	`always {`
`203`	`203`	`// ToDo: Restore the issue scanner`
`204`	`204`	`// scanForIssues tool: clang()`
`205`		`- // junit 'test/results.xml'`
`206`		`- echo "Temporarily Skip Junit"`
	`205`	`+ junit 'test/results.xml'`
`207`	`206`	`}`
`208`	`207`	`}`
`209`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,7 @@ pipeline {`
`133`	`133`	`python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test \|\| echo "** check-lldb failed with errors"`
`134`	`134`	`'''`
`135`	`135`	`}`
`136`		`- // junit 'test/results.xml'`
`137`		`- echo "Temporarily Skip Junit"`
	`136`	`+ junit 'test/results.xml'`
`138`	`137`	`}`
`139`	`138`	`}`
`140`	`139`	`stage('Test DWARF4') {`
`@@ -166,8 +165,7 @@ pipeline {`
`166`	`165`	`python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test \|\| echo "** check-lldb failed with errors"`
`167`	`166`	`'''`
`168`	`167`	`}`
`169`		`- // junit 'test/results.xml'`
`170`		`- echo "Temporarily Skip Junit"`
	`168`	`+ junit 'test/results.xml'`
`171`	`169`	`}`
`172`	`170`	`}`
`173`	`171`	`stage('Test DWARF5') {`
`@@ -199,8 +197,7 @@ pipeline {`
`199`	`197`	`python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test \|\| echo "** check-lldb failed with errors"`
`200`	`198`	`'''`
`201`	`199`	`}`
`202`		`- // junit 'test/results.xml'`
`203`		`- echo "Temporarily Skip Junit"`
	`200`	`+ junit 'test/results.xml'`
`204`	`201`	`}`
`205`	`202`	`}`
`206`	`203`	`stage('Build Clang 15.0.1') {`
`@@ -265,8 +262,7 @@ pipeline {`
`265`	`262`	`python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test \|\| echo "** check-lldb failed with errors"`
`266`	`263`	`'''`
`267`	`264`	`}`
`268`		`- // junit 'test/results.xml'`
`269`		`- echo "Temporarily Skip Junit"`
	`265`	`+ junit 'test/results.xml'`
`270`	`266`	`}`
`271`	`267`	`}`
`272`	`268`	`stage('Build Clang 17.0.6') {`
`@@ -333,8 +329,7 @@ pipeline {`
`333`	`329`	`python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test \|\| echo "** check-lldb failed with errors"`
`334`	`330`	`'''`
`335`	`331`	`}`
`336`		`- // junit 'test/results.xml'`
`337`		`- echo "Temporarily Skip Junit"`
	`332`	`+ junit 'test/results.xml'`
`338`	`333`	`}`
`339`	`334`	`}`
`340`	`335`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,7 @@ pipeline {`
`126`	`126`	`always {`
`127`	`127`	`// ToDo: Restore issue scanner`
`128`	`128`	`// scanForIssues tool: clang()`
`129`		`- // junit 'test/results.xml'`
`130`		`- echo "Temporarily Skip Junit"`
	`129`	`+ junit 'test/results.xml'`
`131`	`130`	`}`
`132`	`131`	`}`
`133`	`132`	`}`