Merge branch 'master' into release/v1.2

opendevstack · Oct 4, 2022 · 2cf7bdd · 2cf7bdd
2 parents 0d0996b + 70ed8d2
commit 2cf7bdd
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## 1.2 - 2022-10-04
+### Added
+- Allow Discrepancies in EDP Templates([#84](https://github.com/opendevstack/ods-document-generation-templates/pull/84))
+- Fix CI name of Container PAAS system references([#85](https://github.com/opendevstack/ods-document-generation-templates/pull/85))
+- Fix truncated table in SSDS when emails cannot be truncated ([#86](https://github.com/opendevstack/ods-document-generation-templates/pull/86))
+- Allow re-deployments and advancing to P despite defects ([#87](https://github.com/opendevstack/ods-document-generation-templates/pull/87))
+
 ## 1.2 - 2022-02-18
 ### Added
 - CFTP for Gamp3/4/5 - Purpose chapter 7.1.1 needs changes([#64](https://github.com/opendevstack/ods-document-generation-templates/pull/64))

diff --git a/css/styles.css b/css/styles.css
@@ -277,3 +277,7 @@ table td.hyphenate {
     -moz-hyphens: auto;
     hyphens: auto;
 }
+
+.break-all{
+  word-break: break-all;
+}
diff --git a/templates/CFTP-3.html.tmpl b/templates/CFTP-3.html.tmpl
@@ -236,7 +236,7 @@
 
         <h3 id="section_8_2"><span>8.2</span>Test Execution</h3>
         <p>Test results shall be recorded in a way that independent reviewer can compare the documented acceptance criteria against the (written or captured) test evidence and determine whether the test results meet these criteria.</p>
-        <p>If both automated and manual test cases exist, automated test cases will be executed before manual test cases. Successful execution of automated test cases (no failures) is the prerequisite to start execution of the manual test cases.</p>
+        <p>If both automated and manual test cases exist, automated test cases will be executed before manual test cases.</p>
 
         <h4 id="section_8_2_1"><span>8.2.1 </span>Execution of Automated Test Cases</h4>
         <p>In case test execution is automated:</p>
@@ -316,7 +316,7 @@
         </ul>
 
         <h3 id="section_11_1"><span>11.1</span> Automated Test Cases</h3>
-        <p>All discrepancies occurring during the test execution are automatically recorded in a designated discrepancy log. Failed automated test cases where the failure cannot be resolved within the Q environment are considered unacceptable. A move to P is not possible. These failures must be resolved via a change control in the Dev environment.</p>
+        <p>All discrepancies occurring during the test execution are automatically recorded in a designated discrepancy log. In case of a re-deployment, a rationale must be documented in a manually created C-DIL document. When advancing to the P environment despite failed test cases or exclusions from testing, a rationale including the analyzed risks must be documented in a manually created C-FTR document (Appendix 1).</p>
 
         <h3 id="section_11_2"><span>11.2</span> Manual Test Cases</h3>
         <p>Upon failing a test case, the Tester shall always contact the Test Administrator immediately to review the problem. The Test Administrator shall decide how to proceed, since test cases may build upon each other and a failure may cascade through several cases.</p>

diff --git a/templates/CFTP-4.html.tmpl b/templates/CFTP-4.html.tmpl
@@ -239,7 +239,7 @@
 
         <h3 id="section_8_2"><span>8.2</span>Test Execution</h3>
         <p>Test results shall be recorded in a way that independent reviewer can compare the documented acceptance criteria against the (written or captured) test evidence and determine whether the test results meet these criteria.</p>
-        <p>If both automated and manual test cases exist, automated test cases will be executed before manual test cases. Successful execution of automated test cases (no failures) is the prerequisite to start execution of the manual test cases.</p>
+        <p>If both automated and manual test cases exist, automated test cases will be executed before manual test cases.</p>
 
         <h4 id="section_8_2_1"><span>8.2.1 </span>Execution of Automated Test Cases</h4>
         <p>In case test execution is automated:</p>
@@ -319,7 +319,7 @@
         </ul>
 
         <h3 id="section_11_1"><span>11.1</span> Automated Test Cases</h3>
-        <p>All discrepancies occurring during the test execution are automatically recorded in a designated discrepancy log. Failed automated test cases where the failure cannot be resolved within the Q environment are considered unacceptable. A move to P is not possible. These failures must be resolved via a change control in the Dev environment.</p>
+        <p>All discrepancies occurring during the test execution are automatically recorded in a designated discrepancy log. In case of a re-deployment, a rationale must be documented in a manually created C-DIL document. When advancing to the P environment despite failed test cases or exclusions from testing, a rationale including the analyzed risks must be documented in a manually created C-FTR document (Appendix 1).</p>
 
         <h3 id="section_11_2"><span>11.2</span> Manual Test Cases</h3>
         <p>Upon failing a test case, the Tester shall always contact the Test Administrator immediately to review the problem. The Test Administrator shall decide how to proceed, since test cases may build upon each other and a failure may cascade through several cases.</p>

diff --git a/templates/CFTP-5.html.tmpl b/templates/CFTP-5.html.tmpl
@@ -239,7 +239,7 @@
 
         <h3 id="section_8_2"><span>8.2</span>Test Execution</h3>
         <p>Test results shall be recorded in a way that independent reviewer can compare the documented acceptance criteria against the (written or captured) test evidence and determine whether the test results meet these criteria.</p>
-        <p>If both automated and manual test cases exist, automated test cases will be executed before manual test cases. Successful execution of automated test cases (no failures) is the prerequisite to start execution of the manual test cases.</p>
+        <p>If both automated and manual test cases exist, automated test cases will be executed before manual test cases.</p>
 
         <h4 id="section_8_2_1"><span>8.2.1 </span>Execution of Automated Test Cases</h4>
         <p>In case test execution is automated:</p>
@@ -319,7 +319,7 @@
         </ul>
 
         <h3 id="section_11_1"><span>11.1</span> Automated Test Cases</h3>
-        <p>All discrepancies occurring during the test execution are automatically recorded in a designated discrepancy log. Failed automated test cases where the failure cannot be resolved within the Q environment are considered unacceptable. A move to P is not possible. These failures must be resolved via a change control in the Dev environment.</p>
+        <p>All discrepancies occurring during the test execution are automatically recorded in a designated discrepancy log. In case of a re-deployment, a rationale must be documented in a manually created C-DIL document. When advancing to the P environment despite failed test cases or exclusions from testing, a rationale including the analyzed risks must be documented in a manually created C-FTR document (Appendix 1).</p>
 
         <h3 id="section_11_2"><span>11.2</span> Manual Test Cases</h3>
         <p>Upon failing a test case, the Tester shall always contact the Test Administrator immediately to review the problem. The Test Administrator shall decide how to proceed, since test cases may build upon each other and a failure may cascade through several cases.</p>

diff --git a/templates/CFTR-1.html.tmpl b/templates/CFTR-1.html.tmpl
@@ -361,7 +361,7 @@
 
 
         <h3 id="section_9_2"><span>9.2</span>Integration Testing: Failed Test Cases / Exclusions from Testing</h3>
-        <p>As the approach is 100% executed and 100% tests passed, the sections "Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution" and "Exclusions from Testing" sections doesn't apply.</p>
+        <p>If all tests were executed as planned and passed successfully, the sections "Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution" and "Exclusions from Testing" do not apply. In case of failed test cases, exclusions from testing and / or re-deployments will be documented in manually created C-DIL and / or C-FTR documents.</p>
 
         <!-- <h4 id="section_9_2_1"><span>9.2.1</span>Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution</h4>
           <table>
@@ -398,7 +398,7 @@
         -->
 
         <h3 id="section_9_3"><span>9.3</span>Acceptance Testing: Failed Test Cases / Exclusions from Testing</h3>
-        <p>As the approach is 100% executed and 100% tests passed, the sections "Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution" and "Exclusions from Testing" sections doesn't apply.</p>
+        <p>If all tests were executed as planned and passed successfully, the sections "Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution" and "Exclusions from Testing" do not apply. In case of failed test cases, exclusions from testing and / or re-deployments will be documented in manually created C-DIL and / or C-FTR documents.</p>
 
         <!--
         <h4 id="section_9_3_1"><span>9.3.1</span>Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution</h4>

diff --git a/templates/CFTR-3.html.tmpl b/templates/CFTR-3.html.tmpl
@@ -363,7 +363,7 @@
 
 
         <h3 id="section_9_2"><span>9.2</span>Integration Testing: Failed Test Cases / Exclusions from Testing</h3>
-        <p>As the approach is 100% executed and 100% tests passed, the sections "Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution" and "Exclusions from Testing" sections doesn't apply.</p>
+        <p>If all tests were executed as planned and passed successfully, the sections "Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution" and "Exclusions from Testing" do not apply. In case of failed test cases, exclusions from testing and / or re-deployments will be documented in manually created C-DIL and / or C-FTR documents.</p>
 
         <!-- <h4 id="section_9_2_1"><span>9.2.1</span>Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution</h4>
           <table>
@@ -400,7 +400,7 @@
         -->
 
         <h3 id="section_9_3"><span>9.3</span>Acceptance Testing: Failed Test Cases / Exclusions from Testing</h3>
-        <p>As the approach is 100% executed and 100% tests passed, the sections "Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution" and "Exclusions from Testing" sections doesn't apply.</p>
+        <p>If all tests were executed as planned and passed successfully, the sections "Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution" and "Exclusions from Testing" do not apply. In case of failed test cases, exclusions from testing and / or re-deployments will be documented in manually created C-DIL and / or C-FTR documents.</p>
 
         <!--
         <h4 id="section_9_3_1"><span>9.3.1</span>Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution</h4>

diff --git a/templates/CFTR-4.html.tmpl b/templates/CFTR-4.html.tmpl
@@ -390,7 +390,7 @@
 
 
         <h3 id="section_9_2"><span>9.2</span>Integration Testing: Failed Test Cases / Exclusions from Testing</h3>
-        <p>As the approach is 100% executed and 100% tests passed, the sections "Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution" and "Exclusions from Testing" sections doesn't apply.</p>
+        <p>If all tests were executed as planned and passed successfully, the sections "Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution" and "Exclusions from Testing" do not apply. In case of failed test cases, exclusions from testing and / or re-deployments will be documented in manually created C-DIL and / or C-FTR documents.</p>
 
         <!-- <h4 id="section_9_2_1"><span>9.2.1</span>Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution</h4>
           <table>
@@ -427,7 +427,7 @@
         -->
 
         <h3 id="section_9_3"><span>9.3</span>Acceptance Testing: Failed Test Cases / Exclusions from Testing</h3>
-        <p>As the approach is 100% executed and 100% tests passed, the sections "Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution" and "Exclusions from Testing" sections doesn't apply.</p>
+        <p>If all tests were executed as planned and passed successfully, the sections "Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution" and "Exclusions from Testing" do not apply. In case of failed test cases, exclusions from testing and / or re-deployments will be documented in manually created C-DIL and / or C-FTR documents.</p>
 
         <!--
         <h4 id="section_9_3_1"><span>9.3.1</span>Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution</h4>

diff --git a/templates/CFTR-5.html.tmpl b/templates/CFTR-5.html.tmpl
@@ -390,7 +390,7 @@
 
 
         <h3 id="section_9_2"><span>9.2</span>Integration Testing: Failed Test Cases / Exclusions from Testing</h3>
-        <p>As the approach is 100% executed and 100% tests passed, the sections "Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution" and "Exclusions from Testing" sections doesn't apply.</p>
+        <p>If all tests were executed as planned and passed successfully, the sections "Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution" and "Exclusions from Testing" do not apply. In case of failed test cases, exclusions from testing and / or re-deployments will be documented in manually created C-DIL and / or C-FTR documents.</p>
 
         <!-- <h4 id="section_9_2_1"><span>9.2.1</span>Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution</h4>
           <table>
@@ -427,7 +427,7 @@
         -->
 
         <h3 id="section_9_3"><span>9.3</span>Acceptance Testing: Failed Test Cases / Exclusions from Testing</h3>
-        <p>As the approach is 100% executed and 100% tests passed, the sections "Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution" and "Exclusions from Testing" sections doesn't apply.</p>
+        <p>If all tests were executed as planned and passed successfully, the sections "Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution" and "Exclusions from Testing" do not apply. In case of failed test cases, exclusions from testing and / or re-deployments will be documented in manually created C-DIL and / or C-FTR documents.</p>
 
         <!--
         <h4 id="section_9_3_1"><span>9.3.1</span>Description of Issue and Analysed Risk, Identification of Risk and Proposed Resolution</h4>

diff --git a/templates/DTP.html.tmpl b/templates/DTP.html.tmpl
@@ -121,7 +121,7 @@
 
     <div class="page">
         <h3 id="section_3_1"><span>3.1</span>Test Environment</h3>
-        <p>The tests are executed on qualified infrastructure (<em>BI-IT-DEVSTACK</em>, <em>BI-IT-CONTAINER-PAAS</em>). If a testcase requires further infrastructure (e.g. AWS), this is described as part of the System and Software Design Specification, and its location will be recorded as part of the Software Development Testing Report.</p>
+        <p>The tests are executed on qualified infrastructure (<em>BI-IT-DEVSTACK</em>, <em>BI-IS-CONTAINER-PAAS</em>). If a testcase requires further infrastructure (e.g. AWS), this is described as part of the System and Software Design Specification, and its location will be recorded as part of the Software Development Testing Report.</p>
     </div>
 
     <div class="page">

diff --git a/templates/IVP.html.tmpl b/templates/IVP.html.tmpl
@@ -352,7 +352,7 @@ Other test cases:
                         <th class="lean">Applicable Version</th>
                     </tr>
                     <tr>
-                        <td class="content-wrappable">BI-IT-Container-PAAS</td>
+                        <td class="content-wrappable">BI-IS-CONTAINER-PAAS</td>
                         <td class="content-wrappable">The platform that runs ODS based applications</td>
                         <td class="content-wrappable">
                             <ol>
@@ -375,7 +375,7 @@ Other test cases:
                         <th class="lean">Applicable Version</th>
                     </tr>
                     <tr>
-                        <td class="content-wrappable">BI-IT-Container-PAAS</td>
+                        <td class="content-wrappable">BI-IS-CONTAINER-PAAS</td>
                         <td class="content-wrappable">The platform that runs ODS based applications</td>
                         <td class="content-wrappable">
                             <ol>
@@ -398,7 +398,7 @@ Other test cases:
                         <th class="lean">Applicable Version</th>
                     </tr>
                     <tr>
-                        <td class="content-wrappable">BI-IT-Container-PAAS</td>
+                        <td class="content-wrappable">BI-IS-CONTAINER-PAAS</td>
                         <td class="content-wrappable">The platform that runs ODS based applications</td>
                         <td class="content-wrappable">
                             <ol>
@@ -421,7 +421,7 @@ Other test cases:
                         <th class="lean">Applicable Version</th>
                     </tr>
                     <tr>
-                        <td class="content-wrappable">BI-IT-Container-PAAS</td>
+                        <td class="content-wrappable">BI-IS-CONTAINER-PAAS</td>
                         <td class="content-wrappable">The platform that runs ODS based applications</td>
                         <td class="content-wrappable">
                             <ol>

diff --git a/templates/IVR.html.tmpl b/templates/IVR.html.tmpl
@@ -366,7 +366,7 @@ Other test cases:
                         <th class="lean">Applicable Version</th>
                     </tr>
                     <tr>
-                        <td class="content-wrappable">BI-IT-Container-PAAS</td>
+                        <td class="content-wrappable">BI-IS-CONTAINER-PAAS</td>
                         <td class="content-wrappable">The platform that runs ODS based applications</td>
                         <td class="content-wrappable">
                             <ol>
@@ -389,7 +389,7 @@ Other test cases:
                         <th class="lean">Applicable Version</th>
                     </tr>
                     <tr>
-                        <td class="content-wrappable">BI-IT-Container-PAAS</td>
+                        <td class="content-wrappable">BI-IS-CONTAINER-PAAS</td>
                         <td class="content-wrappable">The platform that runs ODS based applications</td>
                         <td class="content-wrappable">
                             <ol>
@@ -412,7 +412,7 @@ Other test cases:
                         <th class="lean">Applicable Version</th>
                     </tr>
                     <tr>
-                        <td class="content-wrappable">BI-IT-Container-PAAS</td>
+                        <td class="content-wrappable">BI-IS-CONTAINER-PAAS</td>
                         <td class="content-wrappable">The platform that runs ODS based applications</td>
                         <td class="content-wrappable">
                             <ol>
@@ -435,7 +435,7 @@ Other test cases:
                         <th class="lean">Applicable Version</th>
                     </tr>
                     <tr>
-                        <td class="content-wrappable">BI-IT-Container-PAAS</td>
+                        <td class="content-wrappable">BI-IS-CONTAINER-PAAS</td>
                         <td class="content-wrappable">The platform that runs ODS based applications</td>
                         <td class="content-wrappable">
                             <ol>

diff --git a/templates/SSDS-1.html.tmpl b/templates/SSDS-1.html.tmpl
@@ -158,12 +158,12 @@
                     <tr>
                         <td class="content-wrappable">{{date}}</td>
                         <td class="content-wrappable">{{component}}</td>
-                        <td class="content-wrappable">
+                        <td class="content-wrappable break-all" style="min-width: 200px;">
                             <ul>
                                 <li>{{authorName}}, {{authorEmail}}</li>
                             </ul>
                         </td>
-                        <td class="content-wrappable">
+                        <td class="content-wrappable break-all" style="min-width: 200px;">
                             <ul>
                             {{#each reviewers}}
                                 <li>{{reviewerName}}, {{reviewerEmail}}</li>