Merge Pull Request #9673 from trilinos/Trilinos/master_merge_20210908…

…_000545

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

packages/framework/pr_tools/PullRequestLinuxCudaDriver.sh

@@ -9,16 +9,16 @@ if [ "${Trilinos_CTEST_DO_ALL_AT_ONCE}" == "" ] ; then
 fi
 
 # comment out sh and add what we need individually.
-#source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME
+#source $WORKSPACE/Trilinos/packages/framework/pr_tools/atdm/load-env.sh $JOB_NAME
 
 set -x
 
 #TODO: review appropriate job size
 #cuda 10.1.105 will be built with rhel7G
 if [[ "${JOB_NAME}" == "trilinos-folder/Trilinos_pullrequest_cuda_10.1.105"* ]] ; then
-  bsub -x -Is -q rhel7G -n 16 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} ${WORKSPACE}/Trilinos/cmake/std/PullRequestLinuxDriver.sh
+  bsub -x -Is -q rhel7G -n 16 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} ${WORKSPACE}/Trilinos/packages/framework/pr_tools/PullRequestLinuxDriver.sh
 else
-  bsub -x -Is -q rhel7F -n 16 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} ${WORKSPACE}/Trilinos/cmake/std/PullRequestLinuxDriver.sh
+  bsub -x -Is -q rhel7F -n 16 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} ${WORKSPACE}/Trilinos/packages/framework/pr_tools/PullRequestLinuxDriver.sh
 fi
 # NOTE: Above, this bsub command should grab a single rhel7F (Firestone,
 # Dual-Socket POWER8, 8 cores per socket, K80 GPUs) node.  The option '-x'

packages/framework/pr_tools/PullRequestLinuxCudaVortexDriver.sh

@@ -9,13 +9,13 @@ if [ "${Trilinos_CTEST_DO_ALL_AT_ONCE}" == "" ] ; then
 fi
 
 # comment out sh and add what we need individually.
-#source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME
+#source $WORKSPACE/Trilinos/packages/framework/pr_tools/atdm/load-env.sh $JOB_NAME
 
 set -x
 
 #TODO: review appropriate job size
 bsub -Is -nnodes 2 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} \
-  ${WORKSPACE}/Trilinos/cmake/std/PullRequestLinuxDriver.sh
+  ${WORKSPACE}/Trilinos/packages/framework/pr_tools/PullRequestLinuxDriver.sh
 
 # NOTE: Above, this bsub command should grab a two
 # nodes.  The option '-x' makes sure that only this

packages/framework/pr_tools/PullRequestLinuxDriver.sh

@@ -70,10 +70,10 @@ test -d ${REPO_ROOT:?}/.git || REPO_ROOT=`readlink -f ${WORKSPACE:?}/Trilinos`
 message_std "PRDriver> " "REPO_ROOT : ${REPO_ROOT}"
 
 # Get the md5 checksum of this script:
-sig_script_old=$(get_md5sum ${REPO_ROOT:?}/cmake/std/PullRequestLinuxDriver.sh)
+sig_script_old=$(get_md5sum ${REPO_ROOT:?}/packages/framework/pr_tools/PullRequestLinuxDriver.sh)
 
 # Get the md5 checksum of the Merge script
-sig_merge_old=$(get_md5sum ${REPO_ROOT:?}/cmake/std/PullRequestLinuxDriverMerge.py)
+sig_merge_old=$(get_md5sum ${REPO_ROOT:?}/packages/framework/pr_tools/PullRequestLinuxDriverMerge.py)
 
 
 print_banner "Merge Source into Target"
@@ -87,7 +87,7 @@ merge_cmd_options=(
     ${TRILINOS_SOURCE_SHA:?}
     ${WORKSPACE:?}
     )
-merge_cmd="${PYTHON_EXE:?} ${REPO_ROOT:?}/cmake/std/PullRequestLinuxDriverMerge.py ${merge_cmd_options[@]}"
+merge_cmd="${PYTHON_EXE:?} ${REPO_ROOT:?}/packages/framework/pr_tools/PullRequestLinuxDriverMerge.py ${merge_cmd_options[@]}"
 
 
 # Call the script to handle merging the incoming branch into
@@ -105,13 +105,13 @@ print_banner "Merge completed"
 
 
 # Get the md5 checksum of this script:
-sig_script_new=$(get_md5sum ${REPO_ROOT:?}/cmake/std/PullRequestLinuxDriver.sh)
+sig_script_new=$(get_md5sum ${REPO_ROOT:?}/packages/framework/pr_tools/PullRequestLinuxDriver.sh)
 message_std "PRDriver> " "Old md5 checksum ${sig_script_old:?} for ${SCRIPTFILE:?}"
 message_std "PRDriver> " "New md5 checksum ${sig_script_new:?} for ${SCRIPTFILE:?}"
 message_std "PRDriver> " ""
 
 # Get the md5 checksum of the Merge script
-sig_merge_new=$(get_md5sum ${REPO_ROOT:?}/cmake/std/PullRequestLinuxDriverMerge.py)
+sig_merge_new=$(get_md5sum ${REPO_ROOT:?}/packages/framework/pr_tools/PullRequestLinuxDriverMerge.py)
 message_std "PRDriver> " "Old md5 checksum ${sig_merge_old:?} for ${SCRIPTPATH}/PullRequestLinuxDriverMerge.py"
 message_std "PRDriver> " "New md5 checksum ${sig_merge_new:?} for ${SCRIPTPATH}/PullRequestLinuxDriverMerge.py"
 
@@ -120,7 +120,7 @@ then
     message_std "PRDriver> " ""
     message_std "PRDriver> " "Driver or Merge script change detected. Re-launching PR Driver"
     message_std "PRDriver> " ""
-    ${REPO_ROOT:?}/cmake/std/PullRequestLinuxDriver.sh
+    ${REPO_ROOT:?}/packages/framework/pr_tools/PullRequestLinuxDriver.sh
     exit $?
 fi