From a6fd0d83510cd59dcf38df3e1b1e55195185651c Mon Sep 17 00:00:00 2001 From: forsyth2 <30700190+forsyth2@users.noreply.github.com> Date: Tue, 22 Aug 2023 14:01:56 -0700 Subject: [PATCH] Testing fixes for Compy (#486) * Testing fixes for Compy * Edit Compy test generators --- tests/integration/generated/test_bundles_compy.cfg | 3 ++- tests/integration/generated/test_complete_run_compy.cfg | 5 +++-- tests/integration/utils.py | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/integration/generated/test_bundles_compy.cfg b/tests/integration/generated/test_bundles_compy.cfg index 0f240079..3e287144 100644 --- a/tests/integration/generated/test_bundles_compy.cfg +++ b/tests/integration/generated/test_bundles_compy.cfg @@ -1,7 +1,8 @@ [default] case = v2.LR.historical_0201 constraint = "" -environment_commands = "" +dry_run = "False" +environment_commands = "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.9.0rc12_compy.sh" input = "/compyfs/fors729/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_compy.cfg b/tests/integration/generated/test_complete_run_compy.cfg index f5df5742..ebc54134 100644 --- a/tests/integration/generated/test_complete_run_compy.cfg +++ b/tests/integration/generated/test_complete_run_compy.cfg @@ -1,7 +1,8 @@ [default] case = v2.LR.historical_0201 constraint = "" -environment_commands = "" +dry_run = "False" +environment_commands = "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.9.0rc12_compy.sh" input = "/compyfs/fors729//E3SMv2/v2.LR.historical_0201" input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" @@ -92,7 +93,7 @@ years = "1850:1854:2", "1850:1854:4", walltime = "03:00:00" [[ atm_monthly_180x360_aave_environment_commands ]] - environment_commands = "source /qfs/people/fors729/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_dev_20220722" + environment_commands = "source /qfs/people/fors729/mambaforge/etc/profile.d/conda.sh; conda activate e3sm_diags_20230816" sets = "qbo", ts_subsection = "atm_monthly_180x360_aave" diff --git a/tests/integration/utils.py b/tests/integration/utils.py index 4308b40c..cb1f437e 100644 --- a/tests/integration/utils.py +++ b/tests/integration/utils.py @@ -158,9 +158,9 @@ def get_compy_expansions(config): "bundles_walltime": "02:00:00", "constraint": "", # To run this test, replace conda environment with your e3sm_diags dev environment - "diags_environment_commands": "source /qfs/people/fors729/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_dev_20220722", + "diags_environment_commands": "source /qfs/people/fors729/mambaforge/etc/profile.d/conda.sh; conda activate e3sm_diags_20230816", "diags_walltime": "03:00:00", - "environment_commands_test": "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.8.0rc6_compy.sh", + "environment_commands_test": "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.9.0rc12_compy.sh", "expected_dir": "/compyfs/www/zppy_test_resources/", "partition_long": "slurm", "partition_short": "short",