Fixes for v2.2.0 (#371)

Author: forsyth2

tests/integration/utils.py

@@ -138,7 +138,7 @@ def get_chyrsalis_expansions(config):
         "diags_obs_ts": f"{diags_base_path}/observations/Atm/time-series/",
         "diags_walltime": "2:00:00",
         "environment_commands": f"source {unified_path}/load_latest_e3sm_unified_chrysalis.sh",
-        "environment_commands_test": "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.8.0rc5_chrysalis.sh",
+        "environment_commands_test": "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.8.0rc6_chrysalis.sh",
         "expected_dir": "/lcrc/group/e3sm/public_html/zppy_test_resources/",
         "mapping_path": "/home/ac.zender/data/maps/",
         "partition_long": "compute",
@@ -169,7 +169,7 @@ def get_compy_expansions(config):
         "diags_obs_ts": f"{diags_base_path}/observations/Atm/time-series/",
         "diags_walltime": "03:00:00",
         "environment_commands": f"source {unified_path}/load_latest_e3sm_unified_compy.sh",
-        "environment_commands_test": "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.8.0rc5_compy.sh",
+        "environment_commands_test": "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.8.0rc6_compy.sh",
         "expected_dir": "/compyfs/www/zppy_test_resources/",
         "mapping_path": "/compyfs/zender/maps/",
         "partition_long": "slurm",
@@ -200,7 +200,7 @@ def get_perlmutter_expansions(config):
         "diags_obs_ts": f"{diags_base_path}/observations/Atm/time-series/",
         "diags_walltime": "6:00:00",
         "environment_commands": f"source {unified_path}/load_latest_e3sm_unified_pm-cpu.sh",
-        "environment_commands_test": "source /global/common/software/e3sm/anaconda_envs/test_e3sm_unified_1.8.0rc5_pm-cpu.sh",
+        "environment_commands_test": "source /global/common/software/e3sm/anaconda_envs/test_e3sm_unified_1.8.0rc6_pm-cpu.sh",
         "expected_dir": "/global/cfs/cdirs/e3sm/www/zppy_test_resources/",
         "mapping_path": "/global/homes/z/zender/data/maps/",
         "partition_long": "",