Skip to content

Commit e6e93f0

Browse files
committed
Merge branch 'jgfouca/cime_update_2025_01_15' into master (PR 6898)
Update CIME submodule ... to c8ac5aa1d71987e3f03c93df438945e69d78ff5c Fixes: 1) fix the restart tests by using ceil instead of int 2) Fix for PES append feature 3) MVK/PGN: Import the shutil module rather than the "shutils" module typo 4) Fix BFAILs, they need to be considered DIFF 5) avoid breaking Python environment by prepending CIME paths to PYTHONPATH 6) Remove distutils 7) Fixes test status reporting errors during successful baseline comparison 8) check_input_data: skip three files when staging refcase files to avoid a rmtree error 9) Fix multidriver for MCT: logic was incorrect 10) Fixes compare_xml method for env_batch 11) fix correction for no_leap calendar in tests 12) correct rpointer name in resubmit 13) create_clone: correct the SRCROOT path when using create_clone Changes: 1) create_test: add --driver support for e3sm 2) make the hidden status of batch jobs xml dependent 3) Mark SETUP as FAIL if case.cmpgen_namelists fails 4) improve functionality of hidden workflow flag 5) refine the git interface to handle no git and old git 6) do not report memcomp if no baseline exists 7) clarify prereq option in case.submit 8) Add mem variables to env_batch 9) Updates MVK SystemTest to be configurable via testmod 10) If batch script is already executable, don't chmod it 11) Add timing to git operations 12) Add timestamp to rpointers 13) case.run: add try except clauses to reduce errors in testing 14) jenkins: Canceling batch jobs needs to happen immediately when a signal occurs. 15) bless_test_results: Add option to lock baselines (remove group write) [BFB]
2 parents 7421621 + 9d16cbc commit e6e93f0

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

cime

Submodule cime updated 69 files

cime_config/machines/config_machines.xml

+2
Original file line numberDiff line numberDiff line change
@@ -2484,6 +2484,7 @@
24842484
<cmd_path lang="csh">module</cmd_path>
24852485
<modules>
24862486
<command name="purge"/>
2487+
<command name="load">python/3.11.7-iexc6vq</command>
24872488
<command name="load">subversion/1.14.0-e4smcy3</command>
24882489
<command name="load">perl/5.32.0-bsnc6lt</command>
24892490
<command name="load">cmake/3.24.2-whgdv7y</command>
@@ -3404,6 +3405,7 @@
34043405
<cmd_path lang="csh">module</cmd_path>
34053406
<cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
34063407
<modules>
3408+
<command name="load">python</command>
34073409
<command name="load">cmake</command>
34083410
</modules>
34093411
<modules compiler="!gnu">

cime_config/tests.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
"tests" : (
230230
"SMS_Lm1.ne4pg2_oQU480.F2010",
231231
"ERS_Ld31.ne4pg2_oQU480.F2010",
232-
"ERP_Lm3.ne4pg2_oQU480.F2010",
232+
"ERP_Ld90.ne4pg2_oQU480.F2010",
233233
"SMS_D_Ln5.ne30pg2_r05_IcoswISC30E3r5.F2010",
234234
"ERP_Ld3.ne30pg2_r05_IcoswISC30E3r5.F2010.allactive-pioroot1",
235235
"SMS_Ly1.ne4pg2_oQU480.F2010",
@@ -453,8 +453,8 @@
453453
"time" : "00:40:00",
454454
"tests" : (
455455
"SMS_D_Lm6.f45_g37.IELMFATES.elm-fates_cold",
456-
"ERS_D_Lm13.ne4pg2_ne4pg2.IELMFATES.elm-fates_long",
457-
"ERS_Lm25.ne4pg2_ne4pg2.IELMFATES.elm-fates_cold_nocomp",
456+
"ERS_D_Ld390.ne4pg2_ne4pg2.IELMFATES.elm-fates_long",
457+
"ERS_Ld750.ne4pg2_ne4pg2.IELMFATES.elm-fates_cold_nocomp",
458458
)
459459
},
460460

0 commit comments

Comments
 (0)