update reports to display deploy warning

Signed-off-by: Adam Stokes <battlemidget@users.noreply.github.com>
charmed-kubernetes · Jul 31, 2020 · 2e6508b · 2e6508b
1 parent 072cbf2
commit 2e6508b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/bin/report b/bin/report
@@ -168,9 +168,11 @@ def _gen_metadata():
         test_result, _, obj["build_endtime"] = get_file_prefix("result-", files)
         if not obj["build_endtime"]:
             continue
-
         obj["test_result"] = True if test_result == "True" else False
 
+        deploy_result, _, _ = get_file_prefix("deployresult-", files)
+        obj["deploy_result"] = True if deploy_result == "True" else False
+
         if "validate" not in job_name:
             continue
 
@@ -181,10 +183,14 @@ def _gen_metadata():
         if job_name not in db:
             db[job_name] = {}
 
-        if "test_result" not in obj:
+        if "test_result" not in obj and "deploy_result" not in obj:
             result_bg_class = "bg-light"
             result_btn_class = "btn-light"
             result_bg_color = "#d4dee8!important;"
+        elif obj["deploy_result"] and not obj["test_result"]:
+            result_bg_class = "bg-warning"
+            result_btn_class = "btn-warning"
+            result_bg_color = "##FFFF00!important;"
         elif not obj["test_result"]:
             result_bg_class = "bg-danger"
             result_btn_class = "btn-danger"

diff --git a/ci.bash b/ci.bash
@@ -189,6 +189,9 @@ function ci::run
         kv::set "deploy_result" "True"
         kv::set "deploy_endtime" "$(timestamp)"
 
+        touch "meta/deployresult-True"
+        python bin/s3 cp "meta/deployresult-True" "meta/deployresult-True"
+
         test::execute result
 
         kv::set "build_endtime" "$(timestamp)"

diff --git a/jobs/templates/_base.html b/jobs/templates/_base.html
@@ -34,6 +34,10 @@
           background-color: #ff0018!important;
           color: #000000;
       }
+      .bg-warning, .badge-warning {
+          background-color: ##FFFF00!important;
+          color: #000000;
+      }
       .bg-light, .badge-light {
           background-color: #d4dee8!important;
           color: #000000;