Merge Pull Request #12170 from trilinos/Trilinos/master_merge_2023082…

…5_175835

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20230825_175835 branch to master'
PR Author: trilinos-autotester

commonTools/framework/CMakeLists.txt

@@ -133,8 +133,7 @@ ENDFUNCTION()
 
 
 set(ALL_TOPLEVEL_PACKAGES_REGEX
-  "TrilinosFrameworkTests TrilinosATDMConfigTests .*Kokkos Teuchos KokkosKernels .*EpetraExt Tpetra .*Domi Thyra .*SEACAS .*Teko Intrepid .*MueLu .*ShyLU_DD ShyLU .*Tempus Stokhos ROL Piro Panzer Adelus TrilinosCouplings Pike TrilinosBuildStats TrilinosInstallTests")
-
+  "TrilinosFrameworkTests TrilinosATDMConfigTests .*Kokkos Teuchos KokkosKernels .*EpetraExt Tpetra .*Thyra .*SEACAS .*Teko Intrepid .*MueLu .*ShyLU_DD ShyLU .*Tempus Stokhos ROL Piro Panzer Adelus TrilinosCouplings TrilinosBuildStats TrilinosInstallTests")
 
 create_get_changed_trilinos_packages_test(ProjectsList_TeuchosCore
   "ProjectsList.cmake\npackages/teuchos/core/CMakeLists.txt"
@@ -146,8 +145,8 @@ create_get_changed_trilinos_packages_test(ProjectsList_TeuchosCore
   # The above test ensures that it can detect global build files as well as
   # package files.  Above, we check several of the parent packages in Trilinos
   # and we want to ensure that no subpackages are listed in the array
-  # CTEST_LABELS_FOR_SUBPROJECTS.  We also check to confirm that excluded
-  # packages TriKota and PyTrilinos are excluded.  To do that, we list non EX
+  # CTEST_LABELS_FOR_SUBPROJECTS.  We also check to confirm that
+  # PyTrilinos is excluded.  To do that, we list non EX
   # packages before and after them as they currently appear in the
   # Trilinos/PackagesList.cmake file.  If the PackagesList.cmake file changes,
   # then this test may have to change to accomidate that.  Therefore, we don't
@@ -166,9 +165,9 @@ create_get_changed_trilinos_packages_test(cmake_std_atdm_TeuchosCore_PyTrilinos_
   # get enabled (but excluded ST package PyTrilinos does not get included).
 
 
-create_get_changed_trilinos_packages_test(TeuchosCore_TriKota_NewPackage_Pliris
-  "packages/teuchos/core/CMakeLists.txt\npackages/TriKota/anything\npackages/new_package/anything\npackages/pliris/a.txt"
-  "TeuchosCore,TriKota,NewPackage,Pliris"
+create_get_changed_trilinos_packages_test(TeuchosCore_NewPackage_Pliris
+  "packages/teuchos/core/CMakeLists.txt\npackages/new_package/anything\npackages/pliris/a.txt"
+  "TeuchosCore,NewPackage,Pliris"
   "TeuchosCore,Pliris"
   "Setting Trilinos_ENABLE_TeuchosCore = ON;Setting Trilinos_ENABLE_Pliris = ON"
   "${ALL_TOPLEVEL_PACKAGES_REGEX}"

commonTools/framework/get-changed-trilinos-packages-helpers-unit-tests.sh

@@ -109,10 +109,10 @@ test_trilinos_filter_packages_to_test() {
   filtered_packages=$(trilinos_filter_packages_to_test "Teuchos,Tpetra,PyTrilinos,Panzer")
   ${_ASSERT_EQUALS_} "${filtered_packages}" "Teuchos,Tpetra,PyTrilinos,Panzer"
 
-  filtered_packages=$(trilinos_filter_packages_to_test "TriKota,Teuchos,Tpetra,PyTrilinos,Panzer")
-  ${_ASSERT_EQUALS_} "${filtered_packages}" "TriKota,Teuchos,Tpetra,PyTrilinos,Panzer"
+  filtered_packages=$(trilinos_filter_packages_to_test "Teuchos,Tpetra,PyTrilinos,Panzer")
+  ${_ASSERT_EQUALS_} "${filtered_packages}" "Teuchos,Tpetra,PyTrilinos,Panzer"
 
-  TRILINOS_EXCLUDE_PACKAGES_FROM_PR_TESTING=(TriKota PyTrilinos)
+  TRILINOS_EXCLUDE_PACKAGES_FROM_PR_TESTING=(PyTrilinos)
 
   filtered_packages=$(trilinos_filter_packages_to_test "")
   assertEquals "${filtered_packages}" ""
@@ -123,7 +123,7 @@ test_trilinos_filter_packages_to_test() {
   filtered_packages=$(trilinos_filter_packages_to_test "Teuchos,Tpetra,PyTrilinos,Panzer")
   ${_ASSERT_EQUALS_} "${filtered_packages}" "Teuchos,Tpetra,Panzer"
 
-  filtered_packages=$(trilinos_filter_packages_to_test "TriKota,Teuchos,Tpetra,PyTrilinos,Panzer")
+  filtered_packages=$(trilinos_filter_packages_to_test "Teuchos,Tpetra,PyTrilinos,Panzer")
   ${_ASSERT_EQUALS_} "${filtered_packages}" "Teuchos,Tpetra,Panzer"
 
 }
@@ -139,7 +139,6 @@ test_trilinos_filter_packages_to_test() {
   assertContains "${all_toplevel_packages}" ",TrilinosATDMConfigTests,"
   assertContains "${all_toplevel_packages}" ",Teuchos,"
   assertContains "${all_toplevel_packages}" ",Tpetra,"
-  assertContains "${all_toplevel_packages}" ",TriKota,"
   assertContains "${all_toplevel_packages}" ",PyTrilinos,"
   assertContains "${all_toplevel_packages}" ",NewPackage,"
   assertContains "${all_toplevel_packages}" ",Panzer,"

commonTools/framework/get-changed-trilinos-packages.sh

@@ -41,10 +41,7 @@
 # A) Data that may change
 #
 
-TRILINOS_EXCLUDE_PACKAGES_FROM_PR_TESTING=(
-  TriKota
-  PyTrilinos
-  )
+TRILINOS_EXCLUDE_PACKAGES_FROM_PR_TESTING=(PyTrilinos)
 
 
 #