Merge Pull Request #13413 from jmlapre/Trilinos/TRILFRAME-664

Automatically Merged using Trilinos Pull Request AutoTester PR Title: b'Framework: Enhance CDash reporting' PR Author: jmlapre
trilinos · Sep 17, 2024 · b386530 · b386530
2 parents 0dee7c6 + d037353
commit b386530
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 0 deletions.
diff --git a/.github/workflows/AT2.yml b/.github/workflows/AT2.yml
@@ -103,6 +103,23 @@ jobs:
             --ctest-drop-site sems-cdash-son.sandia.gov/cdash \
             --filename-subprojects ./package_subproject_list.cmake \
             --filename-packageenables ./packageEnables.cmake
+      - name: Summary
+        if: ${{ !cancelled() }}
+        shell: bash -l {0}
+        working-directory: /home/Trilinos/build
+        run: |
+          echo "## Image" >> $GITHUB_STEP_SUMMARY
+          echo "image: ${AT2_IMAGE:-unknown}" >> $GITHUB_STEP_SUMMARY
+          echo "## CDash Links" >> $GITHUB_STEP_SUMMARY
+          echo "### Current Build" >> $GITHUB_STEP_SUMMARY
+          AT2_URL=$(</home/runner/AT2_URL.txt)
+          echo $AT2_URL >> $GITHUB_STEP_SUMMARY
+          echo "### All Builds" >> $GITHUB_STEP_SUMMARY
+          AT2_ALL_BUILDS=$(</home/runner/AT2_ALL_BUILDS.txt)
+          echo $AT2_ALL_BUILDS >> $GITHUB_STEP_SUMMARY
+          echo "## Helpful Links" >> $GITHUB_STEP_SUMMARY
+          echo "https://github.com/trilinos/Trilinos/wiki/Containers" >> $GITHUB_STEP_SUMMARY
+          echo "https://gitlab-ex.sandia.gov/trilinos-project/trilinos-containers/-/wikis/Containers-at-Sandia" >> $GITHUB_STEP_SUMMARY
 
   gcc830-serial-EXPERIMENTAL:
     needs: pre-checks
@@ -177,6 +194,23 @@ jobs:
             --ctest-drop-site sems-cdash-son.sandia.gov/cdash \
             --filename-subprojects ./package_subproject_list.cmake \
             --filename-packageenables ./packageEnables.cmake
+      - name: Summary
+        if: ${{ !cancelled() }}
+        shell: bash -l {0}
+        working-directory: /home/Trilinos/build
+        run: |
+          echo "## Image" >> $GITHUB_STEP_SUMMARY
+          echo "image: ${AT2_IMAGE:-unknown}" >> $GITHUB_STEP_SUMMARY
+          echo "## CDash Links" >> $GITHUB_STEP_SUMMARY
+          echo "### Current Build" >> $GITHUB_STEP_SUMMARY
+          AT2_URL=$(</home/runner/AT2_URL.txt)
+          echo $AT2_URL >> $GITHUB_STEP_SUMMARY
+          echo "### All Builds" >> $GITHUB_STEP_SUMMARY
+          AT2_ALL_BUILDS=$(</home/runner/AT2_ALL_BUILDS.txt)
+          echo $AT2_ALL_BUILDS >> $GITHUB_STEP_SUMMARY
+          echo "## Helpful Links" >> $GITHUB_STEP_SUMMARY
+          echo "https://github.com/trilinos/Trilinos/wiki/Containers" >> $GITHUB_STEP_SUMMARY
+          echo "https://gitlab-ex.sandia.gov/trilinos-project/trilinos-containers/-/wikis/Containers-at-Sandia" >> $GITHUB_STEP_SUMMARY
 
   cuda11-uvm-EXPERIMENTAL:
     needs: pre-checks
@@ -252,3 +286,20 @@ jobs:
             --filename-packageenables ./packageEnables.cmake \
             --max-cores-allowed=96 \
             --num-concurrent-tests=96
+      - name: Summary
+        if: ${{ !cancelled() }}
+        shell: bash -l {0}
+        working-directory: /home/Trilinos/build
+        run: |
+          echo "## Image" >> $GITHUB_STEP_SUMMARY
+          echo "image: ${AT2_IMAGE:-unknown}" >> $GITHUB_STEP_SUMMARY
+          echo "## CDash Links" >> $GITHUB_STEP_SUMMARY
+          echo "### Current Build" >> $GITHUB_STEP_SUMMARY
+          AT2_URL=$(</home/runner/AT2_URL.txt)
+          echo $AT2_URL >> $GITHUB_STEP_SUMMARY
+          echo "### All Builds" >> $GITHUB_STEP_SUMMARY
+          AT2_ALL_BUILDS=$(</home/runner/AT2_ALL_BUILDS.txt)
+          echo $AT2_ALL_BUILDS >> $GITHUB_STEP_SUMMARY
+          echo "## Helpful Links" >> $GITHUB_STEP_SUMMARY
+          echo "https://github.com/trilinos/Trilinos/wiki/Containers" >> $GITHUB_STEP_SUMMARY
+          echo "https://gitlab-ex.sandia.gov/trilinos-project/trilinos-containers/-/wikis/Containers-at-Sandia" >> $GITHUB_STEP_SUMMARY
diff --git a/cmake/SimpleTesting/cmake/ctest-cdash-setup.cmake b/cmake/SimpleTesting/cmake/ctest-cdash-setup.cmake
@@ -120,9 +120,18 @@ string(SUBSTRING ${build_stamp_tmp} 1 1024 build_stamp)
 generate_build_url1(build_url1 ${CTEST_DROP_SITE} ${URL_location} ${CTEST_PROJECT_NAME} ${CTEST_BUILD_NAME} ${build_stamp} ${machine_name})
 generate_build_url2(build_url2 ${CTEST_DROP_SITE} ${URL_location} ${CTEST_PROJECT_NAME} ${CTEST_BUILD_NAME} ${build_stamp})
 generate_build_url3(build_url3 ${CTEST_DROP_SITE} ${URL_location} ${CTEST_PROJECT_NAME} ${CTEST_BUILD_NAME} ${build_stamp})
+generate_build_url4(build_url4 ${CTEST_DROP_SITE} ${URL_location} ${CTEST_PROJECT_NAME} ${PULLREQUESTNUM})
 message(">>> CDash URL1 = ${build_url1}")
 message(">>> CDash URL2 = ${build_url2}")
 message(">>> CDash URL3 = ${build_url3}")
+message(">>> CDash URL4 = ${build_url4}")
+
+if (EXISTS /home/runner/)
+    # Write the URL into the filesystem so AT2 can read it later
+    message(">>> Writing URLs to /home/runner/AT2_URL.txt and AT2_ALL_BUILDS.txt")
+    file(WRITE /home/runner/AT2_URL.txt ${build_url3})
+    file(WRITE /home/runner/AT2_ALL_BUILDS.txt ${build_url4})
+endif()
 
 # -----------------------------------------------------------
 # -- Optionally update the repository

diff --git a/cmake/SimpleTesting/cmake/ctest-functions.cmake b/cmake/SimpleTesting/cmake/ctest-functions.cmake
@@ -194,6 +194,21 @@ function(generate_build_url3 url_output cdash_site cdash_location project_name b
 endfunction()
 
 
+# generate_build_url4 generates a link to view all builds for a particular PR
+function(generate_build_url4 url_output cdash_site cdash_location project_name pr_num)
+    banner("generate_build_url4() START")
+    message(">>> cdash_site    : ${cdash_site}")
+    message(">>> cdash_location: ${cdash_location}")
+    message(">>> project_name  : ${project_name}")
+    message(">>> pr_num        : ${pr_num}")
+    string(REPLACE " " "%20" url_output_tmp
+        "https://${cdash_site}${cdash_location}index.php?project=${project_name}&display=project&begin=2024-01-01&end=now&filtercount=1&showfilters=1&field1=buildname&compare1=65&value1=PR-${pr_num}"
+    )
+    set(${url_output} ${url_output_tmp} PARENT_SCOPE)
+    banner("generate_build_url4() FINISH")
+endfunction()
+
+
 message("+--------------------------------------+")
 message("| ctest-functions.cmake FINISH         |")
 message("+--------------------------------------+")
diff --git a/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationStandard.py b/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationStandard.py
@@ -60,12 +60,14 @@ def execute_test(self):
         if "BUILD_NUMBER" in os.environ:
             print("Running under Jenkins, keeping output less verbose to avoid space issues")
             verbosity_flag = "-V"
+
         cmd = ['ctest',
                verbosity_flag,
                 "-S", f"{self.arg_ctest_driver}",
                f"-Dsource_dir:PATH={self.arg_source_dir}",
                f"-Dbuild_dir:PATH={self.arg_build_dir}",
                f"-Dbuild_name:STRING={self.pullrequest_build_name}",
+               f"-DPULLREQUESTNUM:STRING={self.arg_pullrequest_number}",
                 "-Dskip_by_parts_submit:BOOL=OFF",
                 "-Dskip_update_step:BOOL=ON",
                f"-Ddashboard_model:STRING='{self.dashboard_model}'",