Merge branch 'develop' into mcm86-04oct24-methdoc-ci

src/tools/dev/scripts/pascal_cron_script → src/tools/dev/scripts/poodle_cron_script

@@ -4,9 +4,9 @@
 cd visit_run_tests
 
 # Get the latest version of the test script
-rm -f regressiontest_pascal
-wget https://raw.githubusercontent.com/visit-dav/visit/develop/src/tools/dev/scripts/regressiontest_pascal
+rm -f regressiontest_poodle
+wget https://raw.githubusercontent.com/visit-dav/visit/develop/src/tools/dev/scripts/regressiontest_poodle
 
 # Run the test suite.
-chmod 755 regressiontest_pascal
-./regressiontest_pascal
+chmod 755 regressiontest_poodle
+./regressiontest_poodle

src/tools/dev/scripts/pascal_crontab → src/tools/dev/scripts/poodle_crontab

@@ -4,6 +4,6 @@ SHELL=/bin/sh
 [email protected]
 #
 # run at 10:00 PM, every day
-0 22 * * * $HOME/visit_run_tests/pascal_cron_script >> $HOME/visit_run_tests/out 2>&1
+0 22 * * * $HOME/visit_run_tests/poodle_cron_script >> $HOME/visit_run_tests/out 2>&1
 # run at 6:00 AM, every day
-0 6 * * * $HOME/visit_run_tests/pascal_cron_script2 >> $HOME/visit_run_tests/out 2>&1
+0 6 * * * $HOME/visit_run_tests/poodle_cron_script2 >> $HOME/visit_run_tests/out 2>&1

src/tools/dev/scripts/regressiontest_pascal → src/tools/dev/scripts/regressiontest_poodle

@@ -166,6 +166,10 @@
 #
 #   Justin Privitera, Mon Sep 23 10:18:29 PDT 2024
 #   Update visit-install location.
+#
+#   Eric Brugger, Mon Oct  7 11:15:18 PDT 2024
+#   Updated to run the test suite on poodle instead of pascal. Made
+#   the logic that detects new test results more general.
 # 
 
 # Determine the users name and e-mail address.
@@ -225,7 +229,7 @@ debug="false"
 branch="trunk"
 revision="latest"
 serial="false"
-testHost="pascal"
+testHost="poodle"
 testDir="/usr/WS1/visit"
 post="true"
 
@@ -589,7 +593,7 @@ if test "$post" = "true" ; then
 
     # Check the results into github.
     cd $buildDir/test
-    newResults=\`ls -d *22:00\`
+    newResults=\`ls -d ????-??-??-??:??\`
     # should the dashboard have group perms?
     cd /usr/WS1/visit/dashboard/dashboard
     git add \$newResults baselines index.html
@@ -643,10 +647,10 @@ EOF
 chmod 750 postit_${testHost}
 
 # Run the test suite.
-if test "$testHost" = "pascal" ; then
+if test "$testHost" = "poodle" ; then
     subTag=`date +%Y-%m-%d-%H:%M`
-    ./checkout_pascal $subTag
-    sbatch --partition=pvis --account=wbronze --time=8:00:00 --ntasks=36 --nodes=1 --tasks-per-node=36 -o pascal_testit_$subTag.out ./runit_pascal $subTag
+    ./checkout_poodle $subTag
+    sbatch --partition=pbatch --account=wbronze --time=8:00:00 --ntasks=36 --nodes=1 --tasks-per-node=36 -o poodle_testit_$subTag.out ./runit_poodle $subTag
     sleep 28800
-    ./postit_pascal $subTag
+    ./postit_poodle $subTag
 fi

src/tools/dev/scripts/visit-copy-test-results.py

@@ -7,7 +7,7 @@
 base_dirs = []
 
 imode = 0
-mode_dirs = ["pascal_trunk_serial", "pascal_trunk_parallel", "pascal_trunk_scalable_parallel_icet"]
+mode_dirs = ["poodle_trunk_serial", "poodle_trunk_parallel", "poodle_trunk_scalable_parallel_icet"]
 
 ##############################################################################
 #
@@ -355,7 +355,7 @@ def copy_results(cur_dir):
 def main():
     dirs = []
     for dir in os.listdir("."):
-        if (dir.endswith("22:00")):
+        if (dir.endswith("????-??-??-??:??")):
             dirs.append(dir)
 
     dirs.sort()