Skip to content

Allow tests to use different mpas_analysis environment #763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
forsyth2 merged 1 commit into from
Dec 17, 2025
Merged

Allow tests to use different mpas_analysis environment #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ active = True
anomalyRefYear = 1980
climo_years ="1980-1984", "1985-1990",
enso_years = "1980-1984", "1985-1990",
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
mesh = "EC30to60E2r2"
parallelTaskCount = 6
partition = "compute"
Expand Down
1 change: 1 addition & 0 deletions tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ active = True
anomalyRefYear = 1985
climo_years = "1985-1989", "1990-1995",
enso_years = "1985-1989", "1990-1995",
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
mesh = "IcoswISC30E3r5"
parallelTaskCount = 6
partition = "compute"
Expand Down
1 change: 1 addition & 0 deletions tests/integration/generated/test_weekly_legacy_3.0.0_comprehensive_v2_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ active = True
anomalyRefYear = 1980
climo_years ="1980-1984", "1985-1990",
enso_years = "1980-1984", "1985-1990",
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
mesh = "EC30to60E2r2"
parallelTaskCount = 6
partition = "compute"
Expand Down
1 change: 1 addition & 0 deletions tests/integration/generated/test_weekly_legacy_3.0.0_comprehensive_v3_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ active = True
anomalyRefYear = 1985
climo_years = "1985-1989", "1990-1995",
enso_years = "1985-1989", "1990-1995",
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
mesh = "IcoswISC30E3r5"
parallelTaskCount = 6
partition = "compute"
Expand Down
1 change: 1 addition & 0 deletions tests/integration/template_weekly_comprehensive_v2.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ active = #expand active_mpas_analysis#
anomalyRefYear = 1980
climo_years ="1980-1984", "1985-1990",
enso_years = "1980-1984", "1985-1990",
environment_commands = "#expand mpas_analysis_environment_commands#"
mesh = "EC30to60E2r2"
parallelTaskCount = 6
partition = "#expand partition_long#"
Expand Down
1 change: 1 addition & 0 deletions tests/integration/template_weekly_comprehensive_v3.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ active = #expand active_mpas_analysis#
anomalyRefYear = 1985
climo_years = "1985-1989", "1990-1995",
enso_years = "1985-1989", "1990-1995",
environment_commands = "#expand mpas_analysis_environment_commands#"
mesh = "IcoswISC30E3r5"
parallelTaskCount = 6
partition = "#expand partition_long#"
Expand Down
1 change: 1 addition & 0 deletions tests/integration/template_weekly_legacy_3.0.0_comprehensive_v2.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ active = #expand active_mpas_analysis#
anomalyRefYear = 1980
climo_years ="1980-1984", "1985-1990",
enso_years = "1980-1984", "1985-1990",
environment_commands = "#expand mpas_analysis_environment_commands#"
mesh = "EC30to60E2r2"
parallelTaskCount = 6
partition = "#expand partition_long#"
Expand Down
1 change: 1 addition & 0 deletions tests/integration/template_weekly_legacy_3.0.0_comprehensive_v3.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ active = #expand active_mpas_analysis#
anomalyRefYear = 1985
climo_years = "1985-1989", "1990-1995",
enso_years = "1985-1989", "1990-1995",
environment_commands = "#expand mpas_analysis_environment_commands#"
mesh = "IcoswISC30E3r5"
parallelTaskCount = 6
partition = "#expand partition_long#"
Expand Down
7 changes: 7 additions & 0 deletions tests/integration/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
# (`environment_commands = ""` only redirects to Unified
# if specified under the [default] task)
"diags_environment_commands": "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>",
"mpas_analysis_environment_commands": "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>",
"global_time_series_environment_commands": "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>",
"pcmdi_diags_environment_commands": "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>",
# This is the environment setup for other tasks.
Expand Down Expand Up @@ -143,6 +144,9 @@ def get_expansions():
expansions["diags_environment_commands"] = TEST_SPECIFICS[
"diags_environment_commands"
]
expansions["mpas_analysis_environment_commands"] = TEST_SPECIFICS[
"mpas_analysis_environment_commands"
]
expansions["global_time_series_environment_commands"] = TEST_SPECIFICS[
"global_time_series_environment_commands"
]
Expand Down Expand Up @@ -305,6 +309,9 @@ def generate_cfgs(dry_run=False):
print("CFG FILES HAVE BEEN GENERATED FROM TEMPLATES WITH THESE SETTINGS:")
print(f"UNIQUE_ID={TEST_SPECIFICS['unique_id']}")
print(f"diags_environment_commands={expansions['diags_environment_commands']}")
print(
f"mpas_analysis_environment_commands={expansions['mpas_analysis_environment_commands']}"
)
print(
f"global_time_series_environment_commands={expansions['global_time_series_environment_commands']}"
)
Expand Down
Loading