Edit Chrysalis test generators

E3SM-Project · Aug 22, 2023 · 33c119c · 33c119c
1 parent 603441d
commit 33c119c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/tests/integration/generated/test_bundles_chrysalis.cfg b/tests/integration/generated/test_bundles_chrysalis.cfg
@@ -8,10 +8,8 @@ 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 = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/v2.LR.historical_0201"
-# Need compute to run for 7 hours
 partition = "compute"
 qos = "regular"
-# E3SM Diags needed a 3-hour extension (under 5 hours to run) for complete_run, so adding 5 hours:
 walltime = "07:00:00"
 www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundles_www"
 

diff --git a/tests/integration/generated/test_complete_run_chrysalis.cfg b/tests/integration/generated/test_complete_run_chrysalis.cfg
@@ -90,7 +90,7 @@ years = "1850:1854:2", "1850:1854:4",
   partition = "compute"
   qos = "regular"
   sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","streamflow", "zonal_mean_2d_stratosphere",
-  walltime = "8:00:00"
+  walltime = "5:00:00"
 
   [[ atm_monthly_180x360_aave_environment_commands ]]
   environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20230816"
@@ -121,7 +121,7 @@ years = "1850:1854:2", "1850:1854:4",
   tag = "model_vs_model"
   ts_num_years_ref = 2
   ts_subsection = "atm_monthly_180x360_aave"
-  walltime = "2:00:00"
+  walltime = "5:00:00"
   years = "1852-1853",
 
 [mpas_analysis]

diff --git a/tests/integration/template_bundles.cfg b/tests/integration/template_bundles.cfg
@@ -8,7 +8,7 @@ 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 = "#expand user_output#zppy_test_bundles_output/v2.LR.historical_0201"
-partition = "#expand partition_short#"
+partition = "#expand partition_long#"
 qos = "#expand qos_short#"
 walltime = "#expand bundles_walltime#"
 www = "#expand user_www#zppy_test_bundles_www"

diff --git a/tests/integration/utils.py b/tests/integration/utils.py
@@ -131,11 +131,11 @@ def get_chyrsalis_expansions(config):
     username = config.get("web_portal", "username")
     web_base_path = config.get("web_portal", "base_path")
     d = {
-        "bundles_walltime": "02:00:00",
+        "bundles_walltime": "07:00:00",
         "constraint": "",
         # To run this test, replace conda environment with your e3sm_diags dev environment
         "diags_environment_commands": "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20230816",
-        "diags_walltime": "2:00:00",
+        "diags_walltime": "5:00:00",
         "environment_commands_test": "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.9.0rc12_chrysalis.sh",
         "expected_dir": "/lcrc/group/e3sm/public_html/zppy_test_resources/",
         "partition_long": "compute",