merge main into amd-staging (llvm#3050)

Author: z1-cciauto

.ci/generate_test_report_github.py

@@ -16,8 +16,8 @@
     parser.add_argument("junit_files", help="Paths to JUnit report files.", nargs="*")
     args = parser.parse_args()
 
-    report, _ = generate_test_report_lib.generate_report_from_files(
-        args.title, args.return_code, args.junit_files, None
+    report = generate_test_report_lib.generate_report_from_files(
+        args.title, args.return_code, args.junit_files
     )
 
     print(report)

.ci/generate_test_report_lib.py

@@ -5,6 +5,14 @@
 
 from junitparser import JUnitXml, Failure
 
+SEE_BUILD_FILE_STR = "Download the build's log file to see the details."
+UNRELATED_FAILURES_STR = (
+    "If these failures are unrelated to your changes (for example "
+    "tests are broken or flaky at HEAD), please open an issue at "
+    "https://github.com/llvm/llvm-project/issues and add the "
+    "`infrastructure` label."
+)
+
 
 # Set size_limit to limit the byte size of the report. The default is 1MB as this
 # is the most that can be put into an annotation. If the generated report exceeds
@@ -18,16 +26,7 @@ def generate_report(
     junit_objects,
     size_limit=1024 * 1024,
     list_failures=True,
-    buildkite_info=None,
 ):
-    if not junit_objects:
-        # Note that we do not post an empty report, therefore we can ignore a
-        # non-zero return code in situations like this.
-        #
-        # If we were going to post a report, then yes, it would be misleading
-        # to say we succeeded when the final return code was non-zero.
-        return ("", "success")
-
     failures = {}
     tests_run = 0
     tests_skipped = 0
@@ -51,16 +50,28 @@ def generate_report(
                         (test.classname + "/" + test.name, test.result[0].text)
                     )
 
-    if not tests_run:
-        return ("", None)
-
-    style = "success"
-    # Either tests failed, or all tests passed but something failed to build.
-    if tests_failed or return_code != 0:
-        style = "error"
-
     report = [f"# {title}", ""]
 
+    if tests_run == 0:
+        if return_code == 0:
+            report.extend(
+                [
+                    "The build succeeded and no tests ran. This is expected in some "
+                    "build configurations."
+                ]
+            )
+        else:
+            report.extend(
+                [
+                    "The build failed before running any tests.",
+                    "",
+                    SEE_BUILD_FILE_STR,
+                    "",
+                    UNRELATED_FAILURES_STR,
+                ]
+            )
+        return "\n".join(report)
+
     tests_passed = tests_run - tests_skipped - tests_failed
 
     def plural(num_tests):
@@ -73,22 +84,12 @@ def plural(num_tests):
     if tests_failed:
         report.append(f"* {tests_failed} {plural(tests_failed)} failed")
 
-    if buildkite_info is not None:
-        log_url = (
-            "https://buildkite.com/organizations/{BUILDKITE_ORGANIZATION_SLUG}/"
-            "pipelines/{BUILDKITE_PIPELINE_SLUG}/builds/{BUILDKITE_BUILD_NUMBER}/"
-            "jobs/{BUILDKITE_JOB_ID}/download.txt".format(**buildkite_info)
-        )
-        download_text = f"[Download]({log_url})"
-    else:
-        download_text = "Download"
-
     if not list_failures:
         report.extend(
             [
                 "",
                 "Failed tests and their output was too large to report. "
-                f"{download_text} the build's log file to see the details.",
+                + SEE_BUILD_FILE_STR,
             ]
         )
     elif failures:
@@ -118,20 +119,12 @@ def plural(num_tests):
                 "",
                 "All tests passed but another part of the build **failed**.",
                 "",
-                f"{download_text} the build's log file to see the details.",
+                SEE_BUILD_FILE_STR,
             ]
         )
 
     if failures or return_code != 0:
-        report.extend(
-            [
-                "",
-                "If these failures are unrelated to your changes (for example "
-                "tests are broken or flaky at HEAD), please open an issue at "
-                "https://github.com/llvm/llvm-project/issues and add the "
-                "`infrastructure` label.",
-            ]
-        )
+        report.extend(["", UNRELATED_FAILURES_STR])
 
     report = "\n".join(report)
     if len(report.encode("utf-8")) > size_limit:
@@ -141,16 +134,14 @@ def plural(num_tests):
             junit_objects,
             size_limit,
             list_failures=False,
-            buildkite_info=buildkite_info,
         )
 
-    return report, style
+    return report
 
 
-def generate_report_from_files(title, return_code, junit_files, buildkite_info):
+def generate_report_from_files(title, return_code, junit_files):
     return generate_report(
         title,
         return_code,
         [JUnitXml.fromfile(p) for p in junit_files],
-        buildkite_info=buildkite_info,
     )

.ci/generate_test_report_lib_test.py

@@ -21,7 +21,28 @@ def junit_from_xml(xml):
 class TestReports(unittest.TestCase):
     def test_title_only(self):
         self.assertEqual(
-            generate_test_report_lib.generate_report("Foo", 0, []), ("", "success")
+            generate_test_report_lib.generate_report("Foo", 0, []),
+            dedent(
+                """\
+                # Foo
+
+                The build succeeded and no tests ran. This is expected in some build configurations."""
+            ),
+        )
+
+    def test_title_only_failure(self):
+        self.assertEqual(
+            generate_test_report_lib.generate_report("Foo", 1, []),
+            dedent(
+                """\
+            # Foo
+
+            The build failed before running any tests.
+
+            Download the build's log file to see the details.
+
+            If these failures are unrelated to your changes (for example tests are broken or flaky at HEAD), please open an issue at https://github.com/llvm/llvm-project/issues and add the `infrastructure` label."""
+            ),
         )
 
     def test_no_tests_in_testsuite(self):
@@ -42,7 +63,16 @@ def test_no_tests_in_testsuite(self):
                     )
                 ],
             ),
-            ("", None),
+            dedent(
+                """\
+                # Foo
+
+                The build failed before running any tests.
+
+                Download the build's log file to see the details.
+
+                If these failures are unrelated to your changes (for example tests are broken or flaky at HEAD), please open an issue at https://github.com/llvm/llvm-project/issues and add the `infrastructure` label."""
+            ),
         )
 
     def test_no_failures(self):
@@ -70,8 +100,7 @@ def test_no_failures(self):
               # Foo
 
               * 1 test passed"""
-                ),
-                "success",
+                )
             ),
         )
 
@@ -93,12 +122,6 @@ def test_no_failures_build_failed(self):
                         )
                     )
                 ],
-                buildkite_info={
-                    "BUILDKITE_ORGANIZATION_SLUG": "organization_slug",
-                    "BUILDKITE_PIPELINE_SLUG": "pipeline_slug",
-                    "BUILDKITE_BUILD_NUMBER": "build_number",
-                    "BUILDKITE_JOB_ID": "job_id",
-                },
             ),
             (
                 dedent(
@@ -109,11 +132,10 @@ def test_no_failures_build_failed(self):
 
               All tests passed but another part of the build **failed**.
 
-              [Download](https://buildkite.com/organizations/organization_slug/pipelines/pipeline_slug/builds/build_number/jobs/job_id/download.txt) the build's log file to see the details.
+              Download the build's log file to see the details.
               
               If these failures are unrelated to your changes (for example tests are broken or flaky at HEAD), please open an issue at https://github.com/llvm/llvm-project/issues and add the `infrastructure` label."""
-                ),
-                "error",
+                )
             ),
         )
 
@@ -174,14 +196,12 @@ def test_report_single_file_single_testsuite(self):
           </details>
           
           If these failures are unrelated to your changes (for example tests are broken or flaky at HEAD), please open an issue at https://github.com/llvm/llvm-project/issues and add the `infrastructure` label."""
-                ),
-                "error",
+                )
             ),
         )
 
-    MULTI_SUITE_OUTPUT = (
-        dedent(
-            """\
+    MULTI_SUITE_OUTPUT = dedent(
+        """\
         # ABC and DEF
 
         * 1 test passed
@@ -210,8 +230,6 @@ def test_report_single_file_single_testsuite(self):
         </details>
         
         If these failures are unrelated to your changes (for example tests are broken or flaky at HEAD), please open an issue at https://github.com/llvm/llvm-project/issues and add the `infrastructure` label."""
-        ),
-        "error",
     )
 
     def test_report_single_file_multiple_testsuites(self):
@@ -320,8 +338,7 @@ def test_report_dont_list_failures(self):
           Failed tests and their output was too large to report. Download the build's log file to see the details.
           
           If these failures are unrelated to your changes (for example tests are broken or flaky at HEAD), please open an issue at https://github.com/llvm/llvm-project/issues and add the `infrastructure` label."""
-                ),
-                "error",
+                )
             ),
         )
 
@@ -346,12 +363,6 @@ def test_report_dont_list_failures_link_to_log(self):
                     )
                 ],
                 list_failures=False,
-                buildkite_info={
-                    "BUILDKITE_ORGANIZATION_SLUG": "organization_slug",
-                    "BUILDKITE_PIPELINE_SLUG": "pipeline_slug",
-                    "BUILDKITE_BUILD_NUMBER": "build_number",
-                    "BUILDKITE_JOB_ID": "job_id",
-                },
             ),
             (
                 dedent(
@@ -360,11 +371,10 @@ def test_report_dont_list_failures_link_to_log(self):
 
           * 1 test failed
 
-          Failed tests and their output was too large to report. [Download](https://buildkite.com/organizations/organization_slug/pipelines/pipeline_slug/builds/build_number/jobs/job_id/download.txt) the build's log file to see the details.
+          Failed tests and their output was too large to report. Download the build's log file to see the details.
           
           If these failures are unrelated to your changes (for example tests are broken or flaky at HEAD), please open an issue at https://github.com/llvm/llvm-project/issues and add the `infrastructure` label."""
-                ),
-                "error",
+                )
             ),
         )
 
@@ -403,7 +413,6 @@ def test_report_size_limit(self):
           Failed tests and their output was too large to report. Download the build's log file to see the details.
           
           If these failures are unrelated to your changes (for example tests are broken or flaky at HEAD), please open an issue at https://github.com/llvm/llvm-project/issues and add the `infrastructure` label."""
-                ),
-                "error",
+                )
             ),
         )

.github/workflows/libcxx-build-and-test.yaml

@@ -36,8 +36,7 @@ concurrency:
 jobs:
   stage1:
     if: github.repository_owner == 'llvm'
-    runs-on: libcxx-self-hosted-linux
-    container: ghcr.io/llvm/libcxx-linux-builder:b060022103f551d8ca1dad84122ef73927c86512
+    runs-on: llvm-premerge-libcxx-runners
     continue-on-error: false
     strategy:
       fail-fast: false
@@ -74,8 +73,7 @@ jobs:
             **/crash_diagnostics/*
   stage2:
     if: github.repository_owner == 'llvm'
-    runs-on: libcxx-self-hosted-linux
-    container: ghcr.io/llvm/libcxx-linux-builder:2b57ebb50b6d418e70382e655feaa619b558e254
+    runs-on: llvm-premerge-libcxx-runners
     needs: [ stage1 ]
     continue-on-error: false
     strategy:
@@ -149,21 +147,20 @@ jobs:
           'generic-static',
           'bootstrapping-build'
         ]
-        machine: [ 'libcxx-self-hosted-linux' ]
+        machine: [ 'llvm-premerge-libcxx-runners' ]
         include:
         - config: 'generic-cxx26'
-          machine: libcxx-self-hosted-linux
+          machine: llvm-premerge-libcxx-runners
         - config: 'generic-asan'
-          machine: libcxx-self-hosted-linux
+          machine: llvm-premerge-libcxx-runners
         - config: 'generic-tsan'
-          machine: libcxx-self-hosted-linux
+          machine: llvm-premerge-libcxx-runners
         - config: 'generic-ubsan'
-          machine: libcxx-self-hosted-linux
+          machine: llvm-premerge-libcxx-runners
         # Use a larger machine for MSAN to avoid timeout and memory allocation issues.
         - config: 'generic-msan'
-          machine: libcxx-self-hosted-linux
+          machine: llvm-premerge-libcxx-runners
     runs-on: ${{ matrix.machine }}
-    container: ghcr.io/llvm/libcxx-linux-builder:2b57ebb50b6d418e70382e655feaa619b558e254
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: ${{ matrix.config }}