Test with frozen envs

.gitignore

@@ -10,6 +10,9 @@ test_images_summary.md
 test_*_output
 tests/*.cfg.txt
 tests/integration/image_check_failures*
+tests/main_branch_testing/frozen_env_setup/pin-report-*.md
+tests/main_branch_testing/frozen_env_setup/pinned-dev-*.txt
+tests/main_branch_testing/frozen_env_setup/pinned-dev-*.yml
 
 # Sphinx documentation
 docs/_build/

docs/source/dev_guide/index.rst

@@ -12,9 +12,8 @@ This guide covers everything needed to develop, test, and release ``zppy``.
    parameters
    provenance
    tasks/index
-   test
-   update_expected_results
-   releases/index.rst
+   tests/index
+   releases/index
    new_task
    new_diags_set
    archive/index

docs/source/dev_guide/tests/index.rst

@@ -0,0 +1,14 @@
+.. _tests:
+
+*******
+Tests
+*******
+
+This page collects documentation on testing ``zppy``.
+
+.. toctree::
+   :maxdepth: 1
+
+   manual_test
+   automated_test
+   update_expected_results

docs/source/dev_guide/test.rst → docs/source/dev_guide/tests/manual_test.rst

@@ -1,8 +1,8 @@
-.. _testing-zppy:
+.. _manually-testing-zppy:
 
-*************
-Testing zppy
-*************
+*********************
+Manually testing zppy
+*********************
 
 Follow the steps below to test ``zppy``. As you do so, please produce a Markdown report summarizing your results.
 
@@ -93,6 +93,11 @@ Chrysalis:
         lcrc_conda # Or however you activate conda
         rm -rf build
         conda clean --all --y
+        # The dev.yml file may be in a different directory.
+        # e3sm_to_cmip, e3sm_diags: use conda-dev/
+        # zppy-interfaces, zppy: use conda/
+        # MPAS-Analysis: don't use this command, instead use:
+        # conda create --name ${env_name} --file dev-spec.txt --yes
         conda env create -f conda/dev.yml -n ${env_name}
         conda activate ${env_name}
         pre-commit run --all-files # Confirm this passes

tests/integration/template_weekly_bundles.cfg

@@ -51,10 +51,11 @@ bundle = "bundle1"
 years = "1985:1989:2",
 
   [[ atm_monthly_180x360_aave ]]
+  active = #expand active_climo_month_atm#
   frequency = "monthly"
 
   [[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
-  active = #expand active_e3sm_diags#
+  active = #expand active_climo_diurnal_atm#
   frequency = "diurnal_8xdaily"
   input_files = "eam.h3"
   input_subdir = "archive/atm/hist"
@@ -66,12 +67,13 @@ bundle = "bundle1"
 years = "1985:1989:2",
 
   [[ atm_monthly_180x360_aave ]]
+  active = #expand active_ts_month_atm#
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
 
   [[ atm_monthly_glb ]]
-  active = #expand active_global_time_series#
+  active = #expand active_ts_month_atm_glb#
   bundle = "bundle2" # Override bundle1
   frequency = "monthly"
   input_files = "eam.h0"
@@ -80,6 +82,7 @@ years = "1985:1989:2",
   years = "1985:1995:5",
 
   [[ land_monthly ]]
+  active = #expand active_ts_month_lnd#
   extra_vars = "landfrac"
   frequency = "monthly"
   input_files = "elm.h0"
@@ -88,7 +91,7 @@ years = "1985:1989:2",
   vars = "LAISHA,LAISUN"
 
   [[ rof_monthly ]]
-  active = #expand active_e3sm_diags#
+  active = #expand active_ts_month_rof#
   bundle = "bundle3" # Override bundle1, let bundle1 finish first because "e3sm_diags: atm_monthly_180x360_aave_mvm" requires "ts: atm_monthly_180x360_aave"
   extra_vars = 'areatotal2'
   frequency = "monthly"
@@ -98,22 +101,24 @@ years = "1985:1989:2",
   vars = "RIVER_DISCHARGE_OVER_LAND_LIQ"
 
 [e3sm_to_cmip]
-active = #expand active_e3sm_to_cmip#
+active = True
 bundle = "bundle1"
 environment_commands = "#expand e3sm_to_cmip_environment_commands#"
 frequency = "monthly"
 ts_num_years = 2
 years = "1985:1989:2",
 
   [[ atm_monthly_180x360_aave ]]
+  active = #expand active_e3sm_to_cmip_month_atm#
   input_files = "eam.h0"
 
   [[ land_monthly ]]
+  active = #expand active_e3sm_to_cmip_month_lnd#
   input_files = "elm.h0"
 
 # TODO: Add "tc_analysis" back in after empty dat is resolved.
 # [tc_analysis]
-# active = True
+# active = #expand active_tc_analysis#
 # bundle = "bundle3" # Let bundle1 finish first because "e3sm_diags: atm_monthly_180x360_aave_mvm" requires "ts: atm_monthly_180x360_aave"
 # years = "1985:1989:2",
 

tests/integration/template_weekly_comprehensive_v2.cfg

@@ -19,20 +19,21 @@ active = True
 walltime = "00:30:00"
 
   [[ atm_monthly_180x360_aave ]]
+  active = #expand active_climo_month_atm#
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
   vars = ""
 
   [[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
-  active = #expand active_e3sm_diags#
+  active = #expand active_climo_diurnal_atm#
   frequency = "diurnal_8xdaily"
   input_files = "eam.h3"
   input_subdir = "archive/atm/hist"
   vars = "PRECT"
 
   [[ land_monthly_climo ]]
-  active = #expand active_e3sm_diags#
+  active = #expand active_climo_month_lnd#
   frequency = "monthly"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
@@ -43,19 +44,20 @@ active = True
 walltime = "00:30:00"
 
   [[ atm_monthly_180x360_aave ]]
+  active = #expand active_ts_month_atm#
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
 
   [[ atm_daily_180x360_aave ]]
-  active = #expand active_e3sm_diags#
+  active = #expand active_ts_daily_atm#
   frequency = "daily"
   input_files = "eam.h1"
   input_subdir = "archive/atm/hist"
   vars = "PRECT"
 
   [[ rof_monthly ]]
-  active = #expand active_e3sm_diags#
+  active = #expand active_ts_month_rof#
   extra_vars = 'areatotal2'
   frequency = "monthly"
   input_files = "mosart.h0"
@@ -65,15 +67,15 @@ walltime = "00:30:00"
 
   [[ atm_monthly_glb ]]
   # Note global average won't work for 3D variables.
-  active = #expand active_global_time_series#
+  active = #expand active_ts_month_atm_glb#
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
   mapping_file = "glb"
   years = "1980:1990:5",
 
   [[ lnd_monthly_glb ]]
-  active = #expand active_global_time_series#
+  active = #expand active_ts_month_lnd_glb#
   frequency = "monthly"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
@@ -82,27 +84,30 @@ walltime = "00:30:00"
   years = "1980:1990:5",
 
   [[ land_monthly ]]
+  active = #expand active_ts_month_lnd#
   extra_vars = "landfrac"
   frequency = "monthly"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
   vars = "LAISHA,LAISUN"
 
 [e3sm_to_cmip]
-active = #expand active_e3sm_to_cmip#
+active = True
 environment_commands = "#expand e3sm_to_cmip_environment_commands#"
 frequency = "monthly"
 ts_num_years=2
 walltime = "00:30:00"
 
   [[ atm_monthly_180x360_aave ]]
+  active = #expand active_e3sm_to_cmip_month_atm#
   input_files = "eam.h0"
 
   [[ land_monthly ]]
+  active = #expand active_e3sm_to_cmip_month_lnd#
   input_files = "elm.h0"
 
 [tc_analysis]
-active = #expand active_e3sm_diags#
+active = #expand active_tc_analysis#
 walltime = "00:30:00"
 
 [e3sm_diags]