From fb28424a7923df043530910c9a11875de08c7a5c Mon Sep 17 00:00:00 2001
From: Trevor Cooper <tcooper@rockylinux.org>
Date: Sun, 22 Aug 2021 10:49:13 -0700
Subject: [PATCH 1/5] rename template for clarity

---
 ...uite---needle-update.md => openqa-test-suite-needle-update.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/ISSUE_TEMPLATE/{openqa-test-suite---needle-update.md => openqa-test-suite-needle-update.md} (100%)

diff --git a/.github/ISSUE_TEMPLATE/openqa-test-suite---needle-update.md b/.github/ISSUE_TEMPLATE/openqa-test-suite-needle-update.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/openqa-test-suite---needle-update.md
rename to .github/ISSUE_TEMPLATE/openqa-test-suite-needle-update.md
-- 
2.43.5


From dd9cace546a230d8586b3093a5d1faf1bd27716b Mon Sep 17 00:00:00 2001
From: Trevor Cooper <tcooper@rockylinux.org>
Date: Sun, 22 Aug 2021 11:10:20 -0700
Subject: [PATCH 2/5] update template to incorporate suggestion from @akatch

---
 .../openqa-test-suite-needle-update.md        | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/openqa-test-suite-needle-update.md b/.github/ISSUE_TEMPLATE/openqa-test-suite-needle-update.md
index 2451168d..11eb885e 100644
--- a/.github/ISSUE_TEMPLATE/openqa-test-suite-needle-update.md
+++ b/.github/ISSUE_TEMPLATE/openqa-test-suite-needle-update.md
@@ -1,9 +1,8 @@
 ---
-name: openQA test suite / needle update
-about: This template provide basis for general case submission of issue to resolve
-  openQA test failure via test and/or needle updates
-title: Test suite failure for [insert_test_suite_name_here] on [DISTRI-VERSION-FLAVOR-ARCH]
-labels: ''
+name: openQA test suite and/or needle update
+about: Report openQA test failure and/or needle update requirement
+title: [Test Suite Failure] for [insert_test_suite_name_here] on [DISTRI-VERSION-FLAVOR-ARCH]
+labels: [test suite]
 assignees: ''
 
 ---
@@ -12,15 +11,18 @@ assignees: ''
 
 Please describe the issue as completely as possible so that an appropriate fix may be developed.
 
-| Test Suite | `<please_insert_test_suite_name_here>` |
-|---|---|
-| Result | <please_insert_previous_test_result_here> |
-| Scheduled product | `<please_inster_the_schedule_product_here>` |
-| Test module | `<full_path_to_test_module_to_be_fixed>` |
-| Analysis | *<insert_error_message_produced_in_test>*<br><insert_any_additional_details_that_may_assist_in_resolution> |
+| Test Suite        | <!-- eg: `install_default@uefi` --> |
+|-------------------|-------------------------------------|
+| Result            | <!-- eg: **failed** ( 04:46 minutes ) --> |
+| Scheduled product | <!-- eg: `rocky-8.4-dvd-iso-x86_64` --> |
+| Test module       | <!-- eg: `/var/lib/openqa/share/tests/rocky/tests/_impacted_test_module_here.pm` --> |
+| Analysis          | <!-- eg: *Analysis	Test died: no candidate needle with tag(s) 'anaconda_help_progress_link' matched* --> |
+
+<!-- Provide any additional relevant detail here -->
 
 ## Planned Action
-- Please provide suggested resolution steps if they are know.
+<!-- Outline the steps that should be taken to address this issue -->
 
 ## Special Notes
-- Please provide any special instructions/information that may help testing progress more quickly. For example... Test can run from `disk_64bit_cockpit.qcow2` image if it is saved and stored appropriately in the test system. There is no need to run from beginning and/or trigger from `install_default_upload@64bit`.
+<!-- Please provide any special instructions/information that may help testing progress more quickly -->
+<!-- For example... Test can run from `disk_64bit_cockpit.qcow2` image if it is saved and stored appropriately in the test system. There is no need to run from beginning and/or trigger from `install_default_upload@64bit`. -->
-- 
2.43.5


From 58b8862b4d0ba2cfe5de09782f3fb23a0aabb383 Mon Sep 17 00:00:00 2001
From: Trevor Cooper <tcooper@rockylinux.org>
Date: Sun, 22 Aug 2021 11:20:52 -0700
Subject: [PATCH 3/5] add pull request template

---
 ...openqa-test-suite-pull-request-template.md | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE/openqa-test-suite-pull-request-template.md

diff --git a/.github/PULL_REQUEST_TEMPLATE/openqa-test-suite-pull-request-template.md b/.github/PULL_REQUEST_TEMPLATE/openqa-test-suite-pull-request-template.md
new file mode 100644
index 00000000..e56fde0e
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/openqa-test-suite-pull-request-template.md
@@ -0,0 +1,30 @@
+---
+name: openQA test suite and/or needle Pull Request
+about: Submit openQA test fix and/or needle updates
+title: Test Suite: [insert_test_suite_name_here] on [DISTRI-VERSION-FLAVOR-ARCH]
+labels: 'test suite'
+assignees: ''
+
+---
+
+# Description
+
+<!-- Provide a brief description of the pull request here -->
+<!-- If applicable, specify the issue number this PR fixes -->
+
+<!-- eg: Fixes #999 -->
+
+
+# How Has This Been Tested?
+
+<!-- Indicate what you have done to test this PR, with screenshots if appropriate -->
+
+
+# Checklist:
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] Any dependent changes have been merged and published in downstream modules
-- 
2.43.5


From 04bc7747cfaba2c808047c3df1f47f6754ec2edf Mon Sep 17 00:00:00 2001
From: Trevor Cooper <tcooper@rockylinux.org>
Date: Sun, 22 Aug 2021 11:29:15 -0700
Subject: [PATCH 4/5] request issue creation before pull request

---
 .../openqa-test-suite-pull-request-template.md                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/PULL_REQUEST_TEMPLATE/openqa-test-suite-pull-request-template.md b/.github/PULL_REQUEST_TEMPLATE/openqa-test-suite-pull-request-template.md
index e56fde0e..ca133e9e 100644
--- a/.github/PULL_REQUEST_TEMPLATE/openqa-test-suite-pull-request-template.md
+++ b/.github/PULL_REQUEST_TEMPLATE/openqa-test-suite-pull-request-template.md
@@ -14,6 +14,7 @@ assignees: ''
 
 <!-- eg: Fixes #999 -->
 
+<!-- If no Issue exists it is highly recommended that you create an issue first, assigning it to yourself and then return here to provide the pull request. -->
 
 # How Has This Been Tested?
 
-- 
2.43.5


From fa9098ab5447064db5d281efa29a75fdb235bedb Mon Sep 17 00:00:00 2001
From: StackKorora <42156355+StackKorora@users.noreply.github.com>
Date: Tue, 24 Aug 2021 15:48:36 -0500
Subject: [PATCH 5/5] Update openqa-test-suite-pull-request-template.md

Adding akatch's suggestion.
---
 .../openqa-test-suite-pull-request-template.md                | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE/openqa-test-suite-pull-request-template.md b/.github/PULL_REQUEST_TEMPLATE/openqa-test-suite-pull-request-template.md
index ca133e9e..bc8b32dc 100644
--- a/.github/PULL_REQUEST_TEMPLATE/openqa-test-suite-pull-request-template.md
+++ b/.github/PULL_REQUEST_TEMPLATE/openqa-test-suite-pull-request-template.md
@@ -19,7 +19,9 @@ assignees: ''
 # How Has This Been Tested?
 
 <!-- Indicate what you have done to test this PR, with screenshots if appropriate -->
-
+<!-- At a minimum, please include the following: -->
+<!-- * The command you used to trigger a passing test -->
+<!-- * Criteria for a successful test (eg: suite install_minimal@uefi passes) -->
 
 # Checklist:
 
-- 
2.43.5