From 2cb52fa1adc7cc50db2956843373f8af3bf49d56 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Dec 08 2020 08:40:34 +0000
Subject: Make use of the new rpminspect-report app


---

diff --git a/roles/rpminspect-html-report/defaults/main.yaml b/roles/rpminspect-html-report/defaults/main.yaml
index e71fb75..67e5138 100644
--- a/roles/rpminspect-html-report/defaults/main.yaml
+++ b/roles/rpminspect-html-report/defaults/main.yaml
@@ -1,2 +1,4 @@
 ---
-zuul_output_dir: "{{ ansible_user_dir }}/zuul-output"
+# Webapp source is: https://softwarefactory-project.io/cgit/software-factory/rpminspect-report/
+webapp: "https://fedora.softwarefactory-project.io/rpminspect-report/"
+baseurl: "https://fedora.softwarefactory-project.io/logs/"
diff --git a/roles/rpminspect-html-report/tasks/main.yaml b/roles/rpminspect-html-report/tasks/main.yaml
index 6dbbde4..407d417 100644
--- a/roles/rpminspect-html-report/tasks/main.yaml
+++ b/roles/rpminspect-html-report/tasks/main.yaml
@@ -1,24 +1,7 @@
 ---
-- name: Install system dependencies
-  yum:
-    name: python3-jinja2
-    state: latest
-  become: true
-
-- copy:
-    src: files/report-json2html.py
-    dest: "{{ ansible_user_dir }}/report-json2html.py"
-    mode: '0755'
-
-- name: Create HTML report
-  command: "{{ ansible_user_dir }}/report-json2html.py result.json"
-  args:
-    chdir: "{{ zuul_output_dir }}/logs"
-
-- name: Download the CSS locally
-  get_url:
-    url: https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css
-    dest: "{{ zuul_output_dir }}/logs/bootstrap.min.css"
+- name: Set zuul-log-path fact
+  include_role:
+    name: set-zuul-log-path-fact
 
 - name: Return rpminspect report artifact url
   zuul_return:
@@ -26,4 +9,4 @@
       zuul:
         artifacts:
           - name: rpminspect report
-            url: rpminspect.html
+            url: "{{webapp}}?url={{baseurl}}/{{ zuul_log_path }}/result.json"