From 5a9f61605256657875a1b4368c6ec7693ad11c6a Mon Sep 17 00:00:00 2001
From: timitra <timitra@redhat.com>
Date: Feb 09 2022 12:04:59 +0000
Subject: [PATCH 1/2] Merge branch 'master' of https://pagure.io/fedora-ci/messages into UNIFIED-8903


---

diff --git a/mappings/results/brew-build.test.complete.yaml b/mappings/results/brew-build.test.complete.yaml
index 2d27bd8..03243af 100644
--- a/mappings/results/brew-build.test.complete.yaml
+++ b/mappings/results/brew-build.test.complete.yaml
@@ -3,11 +3,14 @@
 outcome: "${body.test.result}"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
+    ref_url: "${body.test.docs}"
 ref_url: "${body.run.url}"
 msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "brew-build"
+    brew_task_id:
+        - "${body.artifact.id}"
     item:
         - "${body.artifact.nvr}"
     system_provider:
diff --git a/mappings/results/brew-build.test.error.yaml b/mappings/results/brew-build.test.error.yaml
index b4c366e..4cb3d10 100644
--- a/mappings/results/brew-build.test.error.yaml
+++ b/mappings/results/brew-build.test.error.yaml
@@ -3,11 +3,14 @@
 outcome: "ERROR"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
+    ref_url: "${body.test.docs}"
 ref_url: "${body.run.url}"
 msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "brew-build"
+    brew_task_id:
+        - "${body.artifact.id}"
     item:
         - "${body.artifact.nvr}"
     system_provider:
diff --git a/mappings/results/brew-build.test.queued.yaml b/mappings/results/brew-build.test.queued.yaml
index 68ae13f..97742dc 100644
--- a/mappings/results/brew-build.test.queued.yaml
+++ b/mappings/results/brew-build.test.queued.yaml
@@ -3,11 +3,14 @@
 outcome: "QUEUED"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
+    ref_url: "${body.test.docs}"
 ref_url: "${body.run.url}"
 msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "brew-build"
+    brew_task_id:
+        - "${body.artifact.id}"
     item:
         - "${body.artifact.nvr}"
     system_provider:
diff --git a/mappings/results/brew-build.test.running.yaml b/mappings/results/brew-build.test.running.yaml
index 883dd78..fc88a47 100644
--- a/mappings/results/brew-build.test.running.yaml
+++ b/mappings/results/brew-build.test.running.yaml
@@ -3,11 +3,14 @@
 outcome: "RUNNING"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
+    ref_url: "${body.test.docs}"
 ref_url: "${body.run.url}"
 msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "brew-build"
+    brew_task_id:
+        - "${body.artifact.id}"
     item:
         - "${body.artifact.nvr}"
     system_provider:

From 0e157abb6384e4206e01f88922b66fc3d4638b44 Mon Sep 17 00:00:00 2001
From: timitra <timitra@redhat.com>
Date: Feb 09 2022 12:18:55 +0000
Subject: [PATCH 2/2] UNIFIED-8903


---

diff --git a/mappings/results/brew-build.test.complete.yaml b/mappings/results/brew-build.test.complete.yaml
index 03243af..fddb2e9 100644
--- a/mappings/results/brew-build.test.complete.yaml
+++ b/mappings/results/brew-build.test.complete.yaml
@@ -5,7 +5,6 @@ testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
     ref_url: "${body.test.docs}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "brew-build"
@@ -24,4 +23,4 @@ data:
     scratch:
         - "${body.artifact.scratch}"
     msg_id:
-        - "${headers.message-id}"
+        - "${header.JMSMessageID}"
diff --git a/mappings/results/brew-build.test.error.yaml b/mappings/results/brew-build.test.error.yaml
index 4cb3d10..07fcf99 100644
--- a/mappings/results/brew-build.test.error.yaml
+++ b/mappings/results/brew-build.test.error.yaml
@@ -5,7 +5,6 @@ testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
     ref_url: "${body.test.docs}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "brew-build"
@@ -24,4 +23,4 @@ data:
     scratch:
         - "${body.artifact.scratch}"
     msg_id:
-        - "${headers.message-id}"
+        - "${header.JMSMessageID}"
diff --git a/mappings/results/brew-build.test.queued.yaml b/mappings/results/brew-build.test.queued.yaml
index 97742dc..1716f35 100644
--- a/mappings/results/brew-build.test.queued.yaml
+++ b/mappings/results/brew-build.test.queued.yaml
@@ -5,7 +5,6 @@ testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
     ref_url: "${body.test.docs}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "brew-build"
@@ -24,4 +23,4 @@ data:
     scratch:
         - "${body.artifact.scratch}"
     msg_id:
-        - "${headers.message-id}"
+        - "${header.JMSMessageID}"
diff --git a/mappings/results/brew-build.test.running.yaml b/mappings/results/brew-build.test.running.yaml
index fc88a47..b6ae052 100644
--- a/mappings/results/brew-build.test.running.yaml
+++ b/mappings/results/brew-build.test.running.yaml
@@ -5,7 +5,6 @@ testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
     ref_url: "${body.test.docs}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "brew-build"
@@ -24,4 +23,4 @@ data:
     scratch:
         - "${body.artifact.scratch}"
     msg_id:
-        - "${headers.message-id}"
+        - "${header.JMSMessageID}"
diff --git a/mappings/results/component-version.test.complete.yaml b/mappings/results/component-version.test.complete.yaml
index 4895d49..262f3f8 100644
--- a/mappings/results/component-version.test.complete.yaml
+++ b/mappings/results/component-version.test.complete.yaml
@@ -8,7 +8,6 @@ groups:
     - uuid: "${headers.uuid}"
       url: "${body.run.url}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     item:
         - "${body.artifact.component}-${body.artifact.version}"
diff --git a/mappings/results/container-image.test.complete.yaml b/mappings/results/container-image.test.complete.yaml
index 887e9f8..40ebc64 100644
--- a/mappings/results/container-image.test.complete.yaml
+++ b/mappings/results/container-image.test.complete.yaml
@@ -4,7 +4,6 @@ outcome: "${body.test.result}"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "container-image"
diff --git a/mappings/results/container-image.test.error.yaml b/mappings/results/container-image.test.error.yaml
index c8ac397..5dbf221 100644
--- a/mappings/results/container-image.test.error.yaml
+++ b/mappings/results/container-image.test.error.yaml
@@ -4,7 +4,6 @@ outcome: "ERROR"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "container-image"
diff --git a/mappings/results/container-image.test.queued.yaml b/mappings/results/container-image.test.queued.yaml
index 0078c77..263f692 100644
--- a/mappings/results/container-image.test.queued.yaml
+++ b/mappings/results/container-image.test.queued.yaml
@@ -4,7 +4,6 @@ outcome: "QUEUED"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "container-image"
diff --git a/mappings/results/container-image.test.running.yaml b/mappings/results/container-image.test.running.yaml
index b181662..7eb35bb 100644
--- a/mappings/results/container-image.test.running.yaml
+++ b/mappings/results/container-image.test.running.yaml
@@ -4,7 +4,6 @@ outcome: "RUNNING"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "container-image"
diff --git a/mappings/results/fedora-module.test.complete.yaml b/mappings/results/fedora-module.test.complete.yaml
index 2850fef..7db538f 100644
--- a/mappings/results/fedora-module.test.complete.yaml
+++ b/mappings/results/fedora-module.test.complete.yaml
@@ -4,7 +4,6 @@ outcome: "${body.test.result}"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "fedora-module"
diff --git a/mappings/results/fedora-module.test.error.yaml b/mappings/results/fedora-module.test.error.yaml
index 6d6111a..5ba4070 100644
--- a/mappings/results/fedora-module.test.error.yaml
+++ b/mappings/results/fedora-module.test.error.yaml
@@ -4,7 +4,6 @@ outcome: "ERROR"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "fedora-module"
diff --git a/mappings/results/fedora-module.test.queued.yaml b/mappings/results/fedora-module.test.queued.yaml
index d32fed1..d015da6 100644
--- a/mappings/results/fedora-module.test.queued.yaml
+++ b/mappings/results/fedora-module.test.queued.yaml
@@ -4,7 +4,6 @@ outcome: "QUEUED"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "fedora-module"
diff --git a/mappings/results/fedora-module.test.running.yaml b/mappings/results/fedora-module.test.running.yaml
index b50d521..24e1f50 100644
--- a/mappings/results/fedora-module.test.running.yaml
+++ b/mappings/results/fedora-module.test.running.yaml
@@ -4,7 +4,6 @@ outcome: "RUNNING"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "fedora-module"
diff --git a/mappings/results/product-build.test.complete.yaml b/mappings/results/product-build.test.complete.yaml
index 2e15af9..9534000 100644
--- a/mappings/results/product-build.test.complete.yaml
+++ b/mappings/results/product-build.test.complete.yaml
@@ -8,7 +8,6 @@ groups:
     - uuid: "${headers.uuid}"
       url: "${body.run.url}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     item:
         - "${body.artifact.name}-${body.artifact.version}-${body.artifact.release}"
diff --git a/mappings/results/productmd-compose.test.complete.yaml b/mappings/results/productmd-compose.test.complete.yaml
index 7adbfe1..fd8ba6d 100644
--- a/mappings/results/productmd-compose.test.complete.yaml
+++ b/mappings/results/productmd-compose.test.complete.yaml
@@ -4,7 +4,6 @@ outcome: "${body.test.result}"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "productmd-compose"
@@ -23,7 +22,7 @@ data:
     scenario:
         - "#if(${body.test.scenario})${body.test.scenario}#{else}#end"
     msg_id:
-        - "${headers.message-id}"
+        - "${header.JMSMessageID}"
     ci_name:
         - "${body.contact.name}"
     ci_team:
diff --git a/mappings/results/productmd-compose.test.error.yaml b/mappings/results/productmd-compose.test.error.yaml
index 31c2daa..a207e49 100644
--- a/mappings/results/productmd-compose.test.error.yaml
+++ b/mappings/results/productmd-compose.test.error.yaml
@@ -4,7 +4,6 @@ outcome: "ERROR"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "productmd-compose"
@@ -27,7 +26,7 @@ data:
     scenario:
         - "#if(${body.test.scenario})${body.test.scenario}#{else}#end"
     msg_id:
-        - "${headers.message-id}"
+        - "${header.JMSMessageID}"
     ci_name:
         - "${body.contact.name}"
     ci_team:
diff --git a/mappings/results/productmd-compose.test.queued.yaml b/mappings/results/productmd-compose.test.queued.yaml
index cfd46c1..c90e588 100644
--- a/mappings/results/productmd-compose.test.queued.yaml
+++ b/mappings/results/productmd-compose.test.queued.yaml
@@ -4,7 +4,6 @@ outcome: "QUEUED"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "productmd-compose"
@@ -23,7 +22,7 @@ data:
     scenario:
         - "#if(${body.test.scenario})${body.test.scenario}#{else}#end"
     msg_id:
-        - "${headers.message-id}"
+        - "${header.JMSMessageID}"
     ci_name:
         - "${body.contact.name}"
     ci_team:
diff --git a/mappings/results/productmd-compose.test.running.yaml b/mappings/results/productmd-compose.test.running.yaml
index 31b3a93..d8bf746 100644
--- a/mappings/results/productmd-compose.test.running.yaml
+++ b/mappings/results/productmd-compose.test.running.yaml
@@ -4,7 +4,6 @@ outcome: "RUNNING"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "productmd-compose"
@@ -23,7 +22,7 @@ data:
     scenario:
         - "#if(${body.test.scenario})${body.test.scenario}#{else}#end"
     msg_id:
-        - "${headers.message-id}"
+        - "${header.JMSMessageID}"
     ci_name:
         - "${body.contact.name}"
     ci_team:
diff --git a/mappings/results/redhat-module.test.complete.yaml b/mappings/results/redhat-module.test.complete.yaml
index a5f39bb..b48a9f4 100644
--- a/mappings/results/redhat-module.test.complete.yaml
+++ b/mappings/results/redhat-module.test.complete.yaml
@@ -4,7 +4,6 @@ outcome: "${body.test.result}"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "redhat-module"
diff --git a/mappings/results/redhat-module.test.error.yaml b/mappings/results/redhat-module.test.error.yaml
index 2eece49..d5bf3ca 100644
--- a/mappings/results/redhat-module.test.error.yaml
+++ b/mappings/results/redhat-module.test.error.yaml
@@ -4,7 +4,6 @@ outcome: "ERROR"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "redhat-module"
diff --git a/mappings/results/redhat-module.test.queued.yaml b/mappings/results/redhat-module.test.queued.yaml
index 475c8e4..bf31ca4 100644
--- a/mappings/results/redhat-module.test.queued.yaml
+++ b/mappings/results/redhat-module.test.queued.yaml
@@ -4,7 +4,6 @@ outcome: "QUEUED"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "redhat-module"
diff --git a/mappings/results/redhat-module.test.running.yaml b/mappings/results/redhat-module.test.running.yaml
index d950c9c..6d9595b 100644
--- a/mappings/results/redhat-module.test.running.yaml
+++ b/mappings/results/redhat-module.test.running.yaml
@@ -4,7 +4,6 @@ outcome: "RUNNING"
 testcase:
     name: "${body.test.namespace}.${body.test.type}.${body.test.category}"
 ref_url: "${body.run.url}"
-msg-id: "${header.JMSMessageID}"
 data:
     type:
         - "redhat-module"