Testing fixes for Compy (#486)

* Testing fixes for Compy * Edit Compy test generators
E3SM-Project · Aug 22, 2023 · a6fd0d8 · a6fd0d8
1 parent 822be0e
commit a6fd0d8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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",