Merge pull request #25 from GilbN/master

Add option for multiple warning texts

Author: aptalca

ci/ci.py

@@ -104,12 +104,16 @@ def __init__(self) -> None:
             aws_secret_access_key=self.s3_secret)
 
     def run(self,tags: list) -> None:
-        """Will iterate over all the tags running container_test() on each tag multithreaded.
+        """Will iterate over all the tags running container_test() on each tag, multithreaded.
+
+        Also does a pull of the linuxserver/tester:latest image before running container_test.
 
         Args:
             `tags` (list): All the tags we will test on the image.
 
         """
+        self.logger.info("Pulling ghcr.io/linuxserver/tester:latest")
+        self.client.images.pull(repository="ghcr.io/linuxserver/tester", tag="latest") # Pulls latest tester image. 
         thread_pool = ThreadPool(processes=10)
         thread_pool.map(self.container_test,tags)
         display = Display(size=(1920, 1080)) # Setup an x virtual frame buffer (Xvfb) that Selenium can use during the tests.
@@ -130,6 +134,7 @@ def container_test(self, tag: str) -> None:
         2. Export the build version from the Container object.
         3. Export the package info from the Container object.
         4. Take a screenshot for the report.
+        5. Add report information to report.json.
         """
         def _endtest(self: CI, container:Container, tag:str, build_version:str, packages:str, test_success: bool):
             """End the test with as much info as we have and append to the report.
@@ -143,16 +148,23 @@ def _endtest(self: CI, container:Container, tag:str, build_version:str, packages
             """
             logblob = container.logs().decode('utf-8')
             container.remove(force='true')
+            warning_texts = {
+                "dotnet": "May be a .NET app. Service might not start on ARM32 with QEMU",
+                "uwsgi": "This image uses uWSGI and might not start on ARM/QEMU"
+            }
             # Add the info to the report
             self.report_containers[tag] = {
                 'logs': logblob,
                 'sysinfo': packages,
-                'dotnet': bool("icu-libs" in packages),
+                'warnings': {
+                    'dotnet': warning_texts["dotnet"] if "icu-libs" in packages and "arm32" in tag else "",
+                    'uwsgi': warning_texts["uwsgi"] if "uwsgi" in packages and "arm" in tag else ""
+                },
                 'build_version': build_version,
                 'test_results': self.tag_report_tests[tag]['test'],
-                'test_success': test_success
+                'test_success': test_success,
                 }
-
+            self.report_containers[tag]["has_warnings"] = any(warning[1] for warning in self.report_containers[tag]["warnings"].items())
         # Name the thread for easier debugging.
         if "amd" in tag or "arm" in tag:
             current_thread().name = f"{tag[:5].upper()}Thread"

ci/template.html

@@ -54,6 +54,14 @@
         color: rgba(218, 59, 138);
       }
 
+      .summary {
+        color: rgba(218, 59, 138);
+      }
+
+      .summary:hover {
+        color: rgb(188, 52, 120);
+      }
+
       .styled-table {
         border: solid 1px rgb(255 255 255 / 10%);
       }
@@ -92,7 +100,7 @@
         color: rgba(218, 59, 138);
       }
     }
-    .dotnet-note {
+    .warning-note {
       color: #96a2b4;
   }
 
@@ -102,7 +110,7 @@
         color: #738694;
       }
 
-      .dotnet-note {
+      .warning-note {
         color: #738694;
       }
 
@@ -291,6 +299,13 @@
       padding: 0 30px;
     }
 
+    .summary {
+      font-weight: bold;
+      margin-block-start: 1em;
+      margin-inline-start: 0px;
+      margin-inline-end: 0px;
+    }
+
     section img {
       width: calc(100% + 60px);
       height: auto;
@@ -327,7 +342,7 @@
     /*Mobile*/
       section h3,
       section details,
-      .dotnet-notice,
+      .warning-notice,
       .table-container {
           padding: 0 5px;
       }
@@ -374,9 +389,14 @@
       margin-left: 5px;
     }
 
+    .fa-exclamation-triangle {
+      color: darkorange;
+    }
+
     .summary-container {
       min-height: 100px;
       height: 300px;
+      margin-top: 0.5em;
       overflow: auto;
       resize: vertical;
     }
@@ -412,25 +432,31 @@
       color: #f44336;
     }
 
-    .dotnet-notice {
+    .warning-notice {
       display: inline-flex;
     }
 
-    .dotnet-note {
+    .warning-note {
       padding-left: .5rem;
+      padding-top: 0.5em;
       font-weight: normal;
   }
 
-    div.dotnet-notice > p {
+    div.warning-notice > p {
       margin-bottom: 0;
     }
 
-    .dotnet-heading {
+    .warning-summary {
       padding-right:5px;
       padding-bottom:0;
+      margin-block-start: 1em;
       color: darkorange;
       font-weight: bold;
     }
+
+    .warning-summary:hover {
+      color: #ff8c00db;
+    }
   </style>
 
 </head>
@@ -459,22 +485,27 @@ <h2 class="section-header-h2"> {{ image }}:{{ tag }} </h2>
           </div>
           {% endif %}
           <h3 class="build-version">Build Version: {{ report_containers[tag]["build_version"] }}</h3>
-          <h3>Container Logs</h3>
           <details>
-          <summary>Expand</summary>
+          <summary class="summary">Container Logs</summary>
           <div class="summary-container"><pre><code>{{ report_containers[tag]["logs"] }}</code>
           </pre></div>
           </details>
-          <h3>Package info</h3>
           <details>
-          <summary>Expand</summary>
+          <summary class="summary">Package info</summary>
           <div class="summary-container"><pre><code>{{ report_containers[tag]["sysinfo"] }}</code>
           </pre></div>
           </details>
-          {% if 'arm32' in tag and report_containers[tag]["dotnet"] == true %}
-          <div class="dotnet-notice">
-            <p class="dotnet-heading">Warning:<span class="dotnet-note">May be a .NET app. Service might not start on ARM32 with QEMU</span></p>
-          </div>
+          {% if report_containers[tag]["has_warnings"]%}
+          <details open>
+          <summary class="warning-summary">Warnings</summary>
+            {% for warning in report_containers[tag]["warnings"] %}
+              {% if report_containers[tag]["warnings"][warning] %}
+                <div class="warning-notice">
+                  <code class="warning-note"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {{ report_containers[tag]["warnings"][warning] }}</code>
+                </div>
+              {% endif %}
+            {% endfor %}
+          </details>
           {% endif %}
           <div class="table-container">
             <table class="styled-table">