From 315f27db0a0e06de92ee5faa571b6423cc1307f5 Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Tue, 19 Dec 2023 01:55:49 +0000
Subject: [PATCH 1/5] Initial Updates to template

---
 .github/pull_request_template.md | 68 ++++++++++++++++----------------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 2440bf7b5d..78947e35f2 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,32 +1,40 @@
-<!-- THE FOLLOWING IS FOR THE PR AUTHOR TO FILL OUT
-PLEASE DO NOT MODIFY THE TEMPLATE BEYOND FILLING OUT THE PROPER SECTIONS -->
-## PR Author Checklist:
-<!--  Please complete all items in list. -->
-- [ ] I have linked PR's from all sub-components involved in section below. <!-- PLEASE DO NOT LINK SUBCOMPONENT ISSUES -->
-- [ ] I am confirming reviews are completed in ALL sub-component PR's.
-- [ ] I have run the full RT suite on either Hera/Hercules AND have attached the log to this PR below this line:
-  - LOG: 
-- [ ] I have added the list of all failed regression tests to "Anticipated changes" section.
-- [ ] I have filled out all sections of the template.
+<!-- Please fill out all sections of this PR and complete the checklist below-->
+## Commit Queue Requirements:
+- [ ] Fill out all sections of this template.
+- [ ] All sub component pull requests have been reviewed by their code managers.
+- [ ] Run the full RT suite (compared to current baselines) on either Hera/Cheyenne AND have committed the log to my PR branch.
+- [ ] Add list of all failed regression tests in "Regression Tests" section.
 
-## Description
+## PR Information
+
+### Description
 <!-- Provide a detailed description of what this PR does in the space provided below-->
 
+### Commit Message
+<!-- Please provide concise information about the changes in this PR to be used as a commit message for the commit history -->
 
-## Linked Issues and Pull Requests
-### Associated UFSWM Issue to close
-<!-- Example: "- Closes #1698" -->
+### Priority
+[ ] HIGH
+[ ] Medium
+[ ] low
 
+### Blocking Dependencies
+<!-- If there are any PR's that are needed to be completed before this one, please add links
+     to them here -->
 
-### Subcomponent Pull Requests
-<!-- format: - <community>/<repo>/pull/<PR number> i.e.: - NOAA-EMC/fv3atm/pull/33 or "None" -->
+### Git Issues Fixed By This PR
+<!-- Example: "- Closes #1698"  or "- Closes NOAA-EMC/fv3atm/issues/729" -->
 
 
-### Blocking Dependencies
-<!-- Example: "- Depends on #1733" or "None" -->
+## Changes
 
-
-### Subcomponents involved:
+### Subcomponent (with links)
+<!-- (add links to subcomponent PR's here) -->
+<!-- Example:
+[X] FV3
+- NOAA-EMC/fv3atm/pull/734
+- NOAA-EMC/fv3atm/pull/735
+-->
 - [ ] AQM
 - [ ] CDEPS
 - [ ] CICE
@@ -41,7 +49,6 @@ PLEASE DO NOT MODIFY THE TEMPLATE BEYOND FILLING OUT THE PROPER SECTIONS -->
 - [ ] stochastic_physics
 - [ ] none
 
-## Anticipated Changes
 ### Input data
 - [ ] No changes are expected to input data.
 - [ ] Changes are expected to input data:
@@ -51,9 +58,8 @@ PLEASE DO NOT MODIFY THE TEMPLATE BEYOND FILLING OUT THE PROPER SECTIONS -->
 ### Regression Tests:
 - [ ] No changes are expected to any regression test.
 - [ ] Changes are expected to the following tests:
-<!-- Please insert what RT's change and why you expect them to change in the space provided below -->
-<details><summary>Tests effected by changes in this PR:</summary>
-<!-- ADD ITEMS HERE or add "None" -->
+<details><summary>FAILED REGRESSION TESTS</summary>
+<!-- List failed regression tests here or add "None" -->
 
 </details>
 
@@ -64,14 +70,7 @@ PLEASE DO NOT MODIFY THE TEMPLATE BEYOND FILLING OUT THE PROPER SECTIONS -->
   - [ ] Create separate issue in [JCSDA/spack-stack](https://github.com/JCSDA/spack-stack) asking for update to library. Include library name, library version.
   - [ ] Add issue link from JCSDA/spack-stack following this item <!-- for example: "- JCSDA/spack-stack/issue/1757" -->
 
-
-<!-- THE FOLLOWING IS FOR CODE MANAGERS ONLY DO NOT FILL OUT -->
-<details><summary>Code Managers Log</summary>
-
-- [ ] This PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR.
-- [ ] Move new/updated input data on RDHPCS Hera and propagate input data changes to all supported systems.
-  - [ ] N/A
-
+<!-- STOP!!! THE FOLLOWING IS FOR CODE MANAGERS ONLY. PLEASE DO NOT FILL OUT -->
 ### Testing Log:
 - RDHPCS
   - [ ] Hera
@@ -79,7 +78,7 @@ PLEASE DO NOT MODIFY THE TEMPLATE BEYOND FILLING OUT THE PROPER SECTIONS -->
   - [ ] Hercules
   - [ ] Jet
   - [ ] Gaea
-  - [ ] Derecho
+  - [ ] Cheyenne
 - WCOSS2
   - [ ] Dogwood/Cactus
   - [ ] Acorn
@@ -87,5 +86,4 @@ PLEASE DO NOT MODIFY THE TEMPLATE BEYOND FILLING OUT THE PROPER SECTIONS -->
   - [ ] Completed
 - opnReqTest
   - [ ] N/A
-  - [ ] Log attached to comment
-</details>
+  - [ ] Log attached to comment
\ No newline at end of file

From d2e1e08090be540ecac0d68db8bb0aed1a4b7e63 Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Tue, 19 Dec 2023 02:09:02 +0000
Subject: [PATCH 2/5] Fix type for checkboxes and add instructions section to
 pr template

---
 .github/pull_request_template.md | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 78947e35f2..66b291902f 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,4 +1,12 @@
-<!-- Please fill out all sections of this PR and complete the checklist below-->
+<!-- INSTRUCTIONS: 
+- Please fill out all sections of this PR and complete the checklist below
+- Please be as descriptive as possible, this is really important.
+- Please "fill in" checkboxes. Use [X] for a filled in checkbox or leave it [ ] for an empty checkbox
+- Please use github markup as much as possible in linking
+i.e.:
+* Linking to UFSWM PR's and issues add "- #<pr/issue number>"
+* Linking to a subcomponent PR and issues add "- <Group>/<Fork>/pull/#" or "-<Group>/<Fork>/issues/#"
+-->
 ## Commit Queue Requirements:
 - [ ] Fill out all sections of this template.
 - [ ] All sub component pull requests have been reviewed by their code managers.
@@ -14,9 +22,9 @@
 <!-- Please provide concise information about the changes in this PR to be used as a commit message for the commit history -->
 
 ### Priority
-[ ] HIGH
-[ ] Medium
-[ ] low
+- [ ] HIGH
+- [ ] Medium
+- [ ] low
 
 ### Blocking Dependencies
 <!-- If there are any PR's that are needed to be completed before this one, please add links

From 243690f94b50d56e19cbf5ca2601b29125d01fc1 Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Tue, 19 Dec 2023 02:45:48 +0000
Subject: [PATCH 3/5] Cheyenne->Derecho, update GNU machines in template

---
 .github/pull_request_template.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 66b291902f..d2adc4a181 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -10,7 +10,7 @@ i.e.:
 ## Commit Queue Requirements:
 - [ ] Fill out all sections of this template.
 - [ ] All sub component pull requests have been reviewed by their code managers.
-- [ ] Run the full RT suite (compared to current baselines) on either Hera/Cheyenne AND have committed the log to my PR branch.
+- [ ] Run the full RT suite (compared to current baselines) on either Hera/Derecho/Hercules AND have committed the log to my PR branch.
 - [ ] Add list of all failed regression tests in "Regression Tests" section.
 
 ## PR Information
@@ -86,7 +86,7 @@ i.e.:
   - [ ] Hercules
   - [ ] Jet
   - [ ] Gaea
-  - [ ] Cheyenne
+  - [ ] Derecho
 - WCOSS2
   - [ ] Dogwood/Cactus
   - [ ] Acorn

From 0ca12c092ef2357916e8deecfe8dfd639f7cd431 Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Tue, 19 Dec 2023 18:53:24 +0000
Subject: [PATCH 4/5] Updates taking into account most suggestions up to this
 point

---
 .github/pull_request_template.md | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index d2adc4a181..fe05e28fc7 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -4,10 +4,11 @@
 - Please "fill in" checkboxes. Use [X] for a filled in checkbox or leave it [ ] for an empty checkbox
 - Please use github markup as much as possible in linking
 i.e.:
-* Linking to UFSWM PR's and issues add "- #<pr/issue number>"
-* Linking to a subcomponent PR and issues add "- <Group>/<Fork>/pull/#" or "-<Group>/<Fork>/issues/#"
+* Linking to UFSWM PR's and issues add - #<pr/issue number>
+* Linking to a subcomponent PR and issues add - <Group>/<Fork>/pull/<number> or - <Group>/<Fork>/issues/<number>
 -->
 ## Commit Queue Requirements:
+<!-- Please note: PRs will be scheduled in the Commit Queue in the order received and only after all pre-requisite testing is complete and all PR requirements (e.g. Issues created and noted, Subcomponent PRs reviewed and accepted) are met. -->
 - [ ] Fill out all sections of this template.
 - [ ] All sub component pull requests have been reviewed by their code managers.
 - [ ] Run the full RT suite (compared to current baselines) on either Hera/Derecho/Hercules AND have committed the log to my PR branch.
@@ -19,19 +20,26 @@ i.e.:
 <!-- Provide a detailed description of what this PR does in the space provided below-->
 
 ### Commit Message
-<!-- Please provide concise information about the changes in this PR to be used as a commit message for the commit history -->
+<!--
+Please provide the following concise information:
+Description of all changes - 1 line
+Please list all individual issue titles addressed with github links at the end in perenthesis (using #<number> or <group>/<fork>/issues/<number>).
+-->
+
 
 ### Priority
-- [ ] HIGH
-- [ ] Medium
-- [ ] low
+- [ ] Bugfix (This PR contains a bug fix and should be prioritized.)
+- [ ] High (This PR contains a feature or fix needed for a time-sensitive project (eg, retrospectives, implementations))
+- [ ] Normal
+#### Prioriry Reasoning
+<!-- Provide reasoning for your priority above. This is required for Bugfix and High priority items. -->
 
 ### Blocking Dependencies
 <!-- If there are any PR's that are needed to be completed before this one, please add links
      to them here -->
 
 ### Git Issues Fixed By This PR
-<!-- Example: "- Closes #1698"  or "- Closes NOAA-EMC/fv3atm/issues/729" -->
+<!-- Example: - Closes #1698  or - Closes NOAA-EMC/fv3atm/issues/729 -->
 
 
 ## Changes

From 4779ed4f6de68d7e914881497607d8f555f1846b Mon Sep 17 00:00:00 2001
From: Brian Curtis <brian.curtis@noaa.gov>
Date: Tue, 19 Dec 2023 19:58:31 +0000
Subject: [PATCH 5/5] More changes from PR discussion

---
 .github/pull_request_template.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index fe05e28fc7..37214bf9aa 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -8,7 +8,9 @@ i.e.:
 * Linking to a subcomponent PR and issues add - <Group>/<Fork>/pull/<number> or - <Group>/<Fork>/issues/<number>
 -->
 ## Commit Queue Requirements:
-<!-- Please note: PRs will be scheduled in the Commit Queue in the order received and only after all pre-requisite testing is complete and all PR requirements (e.g. Issues created and noted, Subcomponent PRs reviewed and accepted) are met. -->
+<!-- Please note: PRs will be scheduled in the Commit Queue in the order received and only after all
+pre-requisite testing is complete and all PR requirements (e.g. Issues created and noted, Subcomponent
+PRs reviewed and accepted) are met. -->
 - [ ] Fill out all sections of this template.
 - [ ] All sub component pull requests have been reviewed by their code managers.
 - [ ] Run the full RT suite (compared to current baselines) on either Hera/Derecho/Hercules AND have committed the log to my PR branch.
@@ -23,16 +25,14 @@ i.e.:
 <!--
 Please provide the following concise information:
 Description of all changes - 1 line
-Please list all individual issue titles addressed with github links at the end in perenthesis (using #<number> or <group>/<fork>/issues/<number>).
+Please list all individual issue titles addressed with github links at the end in parenthesis (using #<number> or <group>/<fork>/issues/<number>).
 -->
 
 
 ### Priority
-- [ ] Bugfix (This PR contains a bug fix and should be prioritized.)
+- [ ] Critical Bugfix (This PR contains a critical bug fix and should be prioritized.)
 - [ ] High (This PR contains a feature or fix needed for a time-sensitive project (eg, retrospectives, implementations))
 - [ ] Normal
-#### Prioriry Reasoning
-<!-- Provide reasoning for your priority above. This is required for Bugfix and High priority items. -->
 
 ### Blocking Dependencies
 <!-- If there are any PR's that are needed to be completed before this one, please add links