Testing fixes for Compy Unified rc14 (#493)

tests/integration/generated/test_bundles_compy.cfg

@@ -2,13 +2,13 @@
 case = v2.LR.historical_0201
 constraint = ""
 dry_run = "False"
-environment_commands = "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.9.0rc12_compy.sh"
+environment_commands = "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.9.0rc14_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"
 # To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_bundles.py
 output = "/compyfs/fors729/zppy_test_bundles_output/v2.LR.historical_0201"
-partition = "short"
+partition = "slurm"
 qos = "regular"
 walltime = "02:00:00"
 www = "/compyfs/www/fors729/zppy_test_bundles_www"

tests/integration/generated/test_complete_run_compy.cfg

@@ -2,7 +2,7 @@
 case = v2.LR.historical_0201
 constraint = ""
 dry_run = "False"
-environment_commands = "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.9.0rc12_compy.sh"
+environment_commands = "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.9.0rc14_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"
@@ -93,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/mambaforge/etc/profile.d/conda.sh; conda activate e3sm_diags_20230816"
+  environment_commands = "source /qfs/people/fors729/mambaforge/etc/profile.d/conda.sh; conda activate e3sm_diags_20230830"
   sets = "qbo",
   ts_subsection = "atm_monthly_180x360_aave"
 

tests/integration/utils.py

@@ -159,9 +159,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/mambaforge/etc/profile.d/conda.sh; conda activate e3sm_diags_20230816",
+        "diags_environment_commands": "source /qfs/people/fors729/mambaforge/etc/profile.d/conda.sh; conda activate e3sm_diags_20230830",
         "diags_walltime": "03:00:00",
-        "environment_commands_test": "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.9.0rc12_compy.sh",
+        "environment_commands_test": "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.9.0rc14_compy.sh",
         "expected_dir": "/compyfs/www/zppy_test_resources/",
         "mpas_analysis_walltime": "00:30:00",
         "partition_long": "slurm",