From cca5750635fe6c52a7c858306550cf70d5dbcc35 Mon Sep 17 00:00:00 2001 From: Felipe de Azevedo Piovezan Date: Mon, 28 Oct 2024 08:37:09 -0700 Subject: [PATCH] Revert "Disable junit archiving (#271)" The issue that motivated the initial commit was fixed. This reverts commit 72c2e394c8ece6bad45e74200b4caf619da327d1. --- zorg/jenkins/jobs/jobs/clang-san-iossim | 3 +-- zorg/jenkins/jobs/jobs/clang-stage1-RA | 3 +-- zorg/jenkins/jobs/jobs/clang-stage1-RA-expensive | 9 ++++----- .../jobs/jobs/clang-stage1-cmake-RA-incremental | 3 +-- zorg/jenkins/jobs/jobs/clang-stage2-Rthinlto | 3 +-- zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgSan | 3 +-- zorg/jenkins/jobs/jobs/lldb-cmake-as | 3 +-- zorg/jenkins/jobs/jobs/lldb-cmake-intel | 3 +-- zorg/jenkins/jobs/jobs/lldb-cmake-matrix | 15 +++++---------- zorg/jenkins/jobs/jobs/lldb-cmake-sanitized | 3 +-- zorg/jenkins/jobs/jobs/llvm-coverage | 3 +-- 11 files changed, 18 insertions(+), 33 deletions(-) diff --git a/zorg/jenkins/jobs/jobs/clang-san-iossim b/zorg/jenkins/jobs/jobs/clang-san-iossim index edc9b3659..cc3eb8998 100644 --- 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 index a292f0736..2623c16c8 100644 --- 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 index 829b0c501..eeb65fc46 100644 --- 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 index 0a2eff3e0..e0f247371 100644 --- 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 index da633b07a..c24e5b3e5 100644 --- 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 index 171ea076a..25cb7f442 100644 --- 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 index 408e5a856..a12b72cac 100644 --- 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 index d931e1cc3..08604c6f0 100644 --- 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 index b7403ef10..94f27a95c 100644 --- 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 index 24257fba2..97dc7562c 100644 --- 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 index 1e6306f47..0fa0986b8 100755 --- 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 {