diff --git a/tests/integration/generated/test_bundles_pm-cpu.cfg b/tests/integration/generated/test_bundles_pm-cpu.cfg index b201a830..a97f294d 100644 --- a/tests/integration/generated/test_bundles_pm-cpu.cfg +++ b/tests/integration/generated/test_bundles_pm-cpu.cfg @@ -2,7 +2,7 @@ case = v2.LR.historical_0201 constraint = "cpu" dry_run = "False" -environment_commands = "source /global/common/software/e3sm/anaconda_envs/test_e3sm_unified_1.9.0rc12_pm-cpu.sh" +environment_commands = "source /global/common/software/e3sm/anaconda_envs/test_e3sm_unified_1.9.0rc14_pm-cpu.sh" input = "/global/cfs/cdirs/e3sm/forsyth/E3SMv2/v2.LR.historical_0201" input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" diff --git a/tests/integration/generated/test_complete_run_pm-cpu.cfg b/tests/integration/generated/test_complete_run_pm-cpu.cfg index c626e924..50085fd5 100644 --- a/tests/integration/generated/test_complete_run_pm-cpu.cfg +++ b/tests/integration/generated/test_complete_run_pm-cpu.cfg @@ -2,7 +2,7 @@ case = v2.LR.historical_0201 constraint = "cpu" dry_run = "False" -environment_commands = "source /global/common/software/e3sm/anaconda_envs/test_e3sm_unified_1.9.0rc12_pm-cpu.sh" +environment_commands = "source /global/common/software/e3sm/anaconda_envs/test_e3sm_unified_1.9.0rc14_pm-cpu.sh" input = "/global/cfs/cdirs/e3sm/forsyth//E3SMv2/v2.LR.historical_0201" input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" @@ -93,7 +93,7 @@ years = "1850:1854:2", "1850:1854:4", walltime = "6:00:00" [[ atm_monthly_180x360_aave_environment_commands ]] - environment_commands = "source /global/homes/f/forsyth/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20230816" + environment_commands = "source /global/homes/f/forsyth/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20230830_with_edits; source /global/common/software/e3sm/anaconda_envs/spack/e3sm_unified_1_9_0rc14_pm-cpu_gnu_mpich/share/spack/setup-env.sh; spack env activate e3sm_unified_1_9_0rc14_pm-cpu_gnu_mpich" sets = "qbo", ts_subsection = "atm_monthly_180x360_aave" diff --git a/tests/integration/utils.py b/tests/integration/utils.py index 720dd2b0..2cf4778c 100644 --- a/tests/integration/utils.py +++ b/tests/integration/utils.py @@ -184,9 +184,9 @@ def get_perlmutter_expansions(config): "bundles_walltime": "6:00:00", "constraint": "cpu", # To run this test, replace conda environment with your e3sm_diags dev environment - "diags_environment_commands": "source /global/homes/f/forsyth/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20230816", + "diags_environment_commands": "source /global/homes/f/forsyth/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20230830_with_edits; source /global/common/software/e3sm/anaconda_envs/spack/e3sm_unified_1_9_0rc14_pm-cpu_gnu_mpich/share/spack/setup-env.sh; spack env activate e3sm_unified_1_9_0rc14_pm-cpu_gnu_mpich", "diags_walltime": "6:00:00", - "environment_commands_test": "source /global/common/software/e3sm/anaconda_envs/test_e3sm_unified_1.9.0rc12_pm-cpu.sh", + "environment_commands_test": "source /global/common/software/e3sm/anaconda_envs/test_e3sm_unified_1.9.0rc14_pm-cpu.sh", "expected_dir": "/global/cfs/cdirs/e3sm/www/zppy_test_resources/", "mpas_analysis_walltime": "01:00:00", "partition_long": "",