Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
927b034
Update submodules to latests for ccs_config, cime, cdeps, cmeps and s…
ekluzek Aug 22, 2026
8319994
Fix the failing multi-instance tests and remove them from expected fails
ekluzek Aug 24, 2026
920ccf4
Update cime again
ekluzek Aug 25, 2026
3b2dc77
Update cime another time
ekluzek Aug 25, 2026
3bd6d9f
Add some more notes about the different testlists and divide into hea…
ekluzek Aug 25, 2026
1a7a1ee
Use co-pilot AI GPT-4 mini, to create a python script to add ctsm_rel…
ekluzek Aug 26, 2026
c4f81ba
Run through black
ekluzek Aug 26, 2026
c6ebff5
Use co-pilot with some editing from me to get pylint to pass, also ru…
ekluzek Aug 26, 2026
193212e
Clarify what the functions are a bit
ekluzek Aug 26, 2026
82b85b3
Add the new ass_super_testlists.py to the black and pylinting checks
ekluzek Aug 26, 2026
72cf4f3
Black formatting and shorten a line, now passes both black and pylint…
ekluzek Aug 26, 2026
9622e26
A few more clarifying comments and name changes, but also add a new a…
ekluzek Aug 26, 2026
8c2f987
Go through the list of testlists that should be subset of ctsm_sci an…
ekluzek Aug 26, 2026
890cc8a
Clarify that the second testlist is one that shouldn't be in the bloc…
ekluzek Aug 26, 2026
926b89a
Now test that the testlists that are a subset of aux_clm are a subset…
ekluzek Aug 26, 2026
5e45baf
Add testing that rxcropmaturity is a subset of crop_calendars, and ad…
ekluzek Aug 26, 2026
c4afe0c
Add check that fates-landuse testlist is a subset of the fates testlist
ekluzek Aug 26, 2026
48fadb8
subset_data should be a subset of aux_clm rather than ctsm_sci
ekluzek Aug 26, 2026
e8f50a9
Move add_super_testlists guts to python/ctsm
ekluzek Aug 26, 2026
e6217a7
Change name of skeleton script to remove the python extension in the …
ekluzek Aug 26, 2026
3c6a425
Get black and lint python tests to pass
ekluzek Aug 29, 2026
9023e93
Adjust comment from review
ekluzek Aug 29, 2026
5d8984e
Add --check-only option to just check if the file validates and don't…
ekluzek Aug 29, 2026
d0a2716
Add a workflow for checking the testlist
ekluzek Aug 29, 2026
c423511
Change two warnings into errors that abort, this did find problems th…
ekluzek Aug 29, 2026
5bf3607
Run through black
ekluzek Aug 29, 2026
0a06d05
Update cime to latest again
ekluzek Aug 29, 2026
5f5347f
Move all options blocks outside of the <machines> blocks and add a />…
ekluzek Aug 30, 2026
5fc787a
Get the ending /> for a test that was missing
ekluzek Aug 30, 2026
eeb72f5
Ran add_super_testlists to fix more tests that didn't have ctsm_release
ekluzek Aug 30, 2026
7a2ed80
Remove two tests that were duplicated above
ekluzek Aug 30, 2026
0559d30
One last update of cmeps
ekluzek Aug 30, 2026
36eeb05
Fix workflow file
ekluzek Aug 30, 2026
22576ec
Add unit tester created by claude-sonnet-5
ekluzek Aug 31, 2026
c4de0e7
The second DAE test is 6 hours, so GLC_NCPL needs to be 4
ekluzek Aug 31, 2026
3c7f4ea
Update the changelog template in regard to the new testlists
ekluzek Aug 31, 2026
50cce80
Lengthen test wallclock as needed on Izumi
ekluzek Aug 31, 2026
a0779ad
Initial add of the ChangeLog files
ekluzek Aug 31, 2026
b6d1f78
Merge branch 'update_submodules_to_beta10_latest' of github.com:ekluz…
ekluzek Aug 31, 2026
48f3478
Add handling for not just the first instance, but each machine_compil…
ekluzek Aug 31, 2026
8998ab9
Update testlist so that all machine_compiler combinations are handled…
ekluzek Aug 31, 2026
5e7346a
Run through black
ekluzek Aug 31, 2026
22da667
Add commit to git-blame
ekluzek Aug 31, 2026
3101ef9
Get pylint to pass
ekluzek Aug 31, 2026
14f14eb
Finalize changelog
ekluzek Aug 31, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,4 @@ ac03492012837799b7111607188acff9f739044a
d858665d799690d73b56bcb961684382551193f4
c0c6da391ee359f2765439426f3a2a4593a95343
598de2f05638286b3d99ac0ed120977cbc554c3d
5e7346ad28be374735ff9200861d9526d3dbbf53
37 changes: 37 additions & 0 deletions .github/workflows/check-testlists.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Run checking of the testlist

on:
push:
# Run when a change to these files is pushed to any branch. Without the "branches:" line, for some reason this will be run whenever a tag is pushed, even if the listed files aren't changed.
branches: ['*']
paths:
- 'python/ctsm/add_supertestlists.py'
- 'cime_config/add_supertestlists'
- 'cime_config/testlist_clm.xml'
pull_request:
# Run on pull requests that change the listed files
paths:
- 'python/ctsm/add_supertestlists.py'
- 'cime_config/add_supertestlists'
- 'cime_config/testlist_clm.xml'

jobs:
testlist-supertestlists:
runs-on: ubuntu-latest
steps:
# Checkout the code
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

# Set up the conda environment
- uses: conda-incubator/setup-miniconda@2defc80cc6f4028b1780c50faf08dd505d698976 # v3
with:
activate-environment: ctsm_pylib
environment-file: python/conda_env_ctsm_py.yml
channels: conda-forge
auto-activate-base: false

# Run add_supertestlists
- name: Run testlist checker for that lists that should be subsets of others are valid
run: |
cd cime_config/testdef
conda run -n ctsm_pylib ./add_super_testlists --silent --check-only
10 changes: 5 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -68,39 +68,39 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
[submodule "ccs_config"]
path = ccs_config
url = https://github.com/ESMCI/ccs_config_cesm.git
fxtag = ccs_config_cesm1.0.83
fxtag = ccs_config_cesm1.0.88
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git

[submodule "cime"]
path = cime
url = https://github.com/ESMCI/cime
fxtag = cime6.2.2
fxtag = cime6.5.5
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESMCI/cime

[submodule "cmeps"]
path = components/cmeps
url = https://github.com/ESCOMP/CMEPS.git
fxtag = cmeps1.1.47
fxtag = cmeps1.1.64
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git

[submodule "cdeps"]
path = components/cdeps
url = https://github.com/ESCOMP/CDEPS.git
fxtag = cdeps1.0.103
fxtag = cdeps1.0.105
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git

[submodule "share"]
path = share
url = https://github.com/ESCOMP/CESM_share
fxtag = share1.1.20
fxtag = share1.1.21
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
Expand Down
2 changes: 1 addition & 1 deletion cime
Submodule cime updated 100 files
14 changes: 0 additions & 14 deletions cime_config/testdefs/ExpectedTestFails.xml
Original file line number Diff line number Diff line change
Expand Up @@ -142,20 +142,6 @@
</phase>
</test>

<test name="DAE_C2_D_Lh12.f10_f10_mg37.I2000Clm50BgcCrop.derecho_intel.clm-DA_multidrv">
<phase name="RUN">
<status>FAIL</status>
<issue>ESCOMP/CDEPS#3788</issue>
</phase>
</test>

<test name="SMS_C2_D_Lh12.f10_f10_mg37.I2000Clm50Sp.derecho_intel.clm-pauseResume">
<phase name="RUN">
<status>FAIL</status>
<issue>ESCOMP/CDEPS#3788</issue>
</phase>
</test>

<test name="ERP_Ly3_P64x2.f10_f10_mg37.IHistClm50BgcCrop.derecho_intel.clm-cropMonthOutput">
<phase name="COMPARE_base_rest">
<status>FAIL</status>
Expand Down
33 changes: 33 additions & 0 deletions cime_config/testdefs/add_super_testlists
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/usr/bin/env python3
"""
This is a just top-level skeleton script that calls
add_super_testlists.py.
The original code (add_super_testlists.py) is located under the
python/ctsm folder.

For full instructions on how to run the code and different options,
please check the python/ctsm/add_super_testlists.py file, or run this
script with --help.

----------------------------------------------------------------
Instructions for running using conda python environments:

../../py_env_create
conda activate ctsm_py

Utilities to ensure tests in `testlist_clm.xml` are included in
super-testlists (for example, `ctsm_release`).
"""
import os
import sys

# -- add python/ctsm to path
_CTSM_PYTHON = os.path.join(
os.path.dirname(os.path.realpath(__file__)), os.pardir, os.pardir, "python"
)
sys.path.insert(1, _CTSM_PYTHON)

from ctsm.add_super_testlists import main # pylint: disable=wrong-import-position

if __name__ == "__main__":
main()
Loading
Loading