@@ -9,10 +9,23 @@ rm -rf /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bund
99rm -rf /lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/v2.LR.historical_0201/post
1010# Generate cfg
1111python tests/integration/utils.py
12+
13+ # Run first set of jobs:
1214zppy -c tests/integration/generated/test_bundles_chrysalis.cfg
13- # bundle1 and bundle2 should run. After they finish, invoke zppy again to resolve remaining dependencies:
15+ # bundle1 and bundle2 should run. After they finish, check the results:
16+ cd /lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/v2.LR.historical_0201/post/scripts
17+ grep -v "OK" *status
18+ # Nothing should print
19+
20+ # Now, invoke zppy again to run jobs that needed to wait for dependencies:
1421zppy -c tests/integration/generated/test_bundles_chrysalis.cfg
15- # bundle3 and ilamb should run
22+ # bundle3 and ilamb should run. After they finish, check the results:
23+ cd /lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/v2.LR.historical_0201/post/scripts
24+ grep -v "OK" *status
25+ # Nothing should print
26+
27+ # If a final release has just been made, run:
28+ cp /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles expected_bundles_v<version>
1629```
1730
1831### test_complete_run
@@ -22,7 +35,16 @@ rm -rf /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_comp
2235rm -rf /lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/v2.LR.historical_0201/post
2336# Generate cfg
2437python tests/integration/utils.py
38+
39+ # Run jobs:
2540zppy -c tests/integration/generated/test_complete_run_chrysalis.cfg
41+ # After they finish, check the results:
42+ cd /lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/v2.LR.historical_0201/post/scripts
43+ grep -v "OK" *status
44+ # Nothing should print
45+
46+ # If a final release has just been made, run:
47+ cp /lcrc/group/e3sm/public_html/zppy_test_resources/expected_complete_run expected_complete_run_v<version>
2648```
2749
2850## Commands to run to replace outdated expected files
@@ -39,7 +61,7 @@ mv test_bash_generation_output/post/scripts /lcrc/group/e3sm/public_html/zppy_te
3961python -u -m unittest tests/integration/test_bash_generation.py
4062```
4163
42- #### test_bundles
64+ ### test_bundles
4365
4466```
4567rm -rf /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles
@@ -49,6 +71,8 @@ cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundl
4971mkdir -p /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files
5072cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/v2.LR.historical_0201/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files
5173cd /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles
74+ # Remove the image check failures, so they don't end up in the expected files.
75+ rm -rf /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/forsyth/zppy_test_bundles_www/v2.LR.historical_0201/image_check_failures
5276# This file will list all the expected images.
5377find . -type f -name '*.png' > ../image_list_expected_bundles.txt
5478cd <top level of zppy repo>
@@ -79,6 +103,8 @@ rm -rf /lcrc/group/e3sm/public_html/zppy_test_resources/expected_complete_run
79103# Copy output so you don't have to rerun zppy to generate the output.
80104cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_complete_run_www/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_complete_run
81105cd /lcrc/group/e3sm/public_html/zppy_test_resources/expected_complete_run
106+ # Remove the image check failures, so they don't end up in the expected files.
107+ rm -rf /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/forsyth/zppy_test_complete_run_www/v2.LR.historical_0201/image_check_failures
82108# This file will list all the expected images.
83109find . -type f -name '*.png' > ../image_list_expected_complete_run.txt
84110cd <top level of zppy repo>
@@ -97,3 +123,19 @@ mv test_defaults_output/post/scripts/*.settings /lcrc/group/e3sm/public_html/zpp
97123# Rerun test
98124python -u -m unittest tests/integration/test_defaults.py
99125```
126+
127+ ## Commands to generate official expected results for a release
128+
129+ ### test_bundles
130+
131+ ```
132+ cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundles_www/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles_unified_<#>
133+ mkdir -p /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles_unified_<#>/bundle_files
134+ cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/v2.LR.historical_0201/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles_unified_<#>/bundle_files
135+ ```
136+
137+ ### test_complete_run
138+
139+ ```
140+ cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_complete_run_www/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_complete_run_unified_<#>
141+ ```
0 commit comments