From b8dd10a3d2caa3305e67059399c000fc01aa8002 Mon Sep 17 00:00:00 2001
From: Andrew Theurer <atheurer@redhat.com>
Date: Thu, 21 Nov 2024 13:46:33 -0500
Subject: [PATCH 1/2] Delete all docs by run-uuid

---
 queries/cdmq/delete-run.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/queries/cdmq/delete-run.js b/queries/cdmq/delete-run.js
index f1de4a82..bd1ddfe0 100644
--- a/queries/cdmq/delete-run.js
+++ b/queries/cdmq/delete-run.js
@@ -32,12 +32,10 @@ async function waitFor(docTypes) {
   }
 }
 
-var nonMetricDocTypes = ['run', 'iteration', 'sample', 'period', 'param', 'tag'];
-var remainingDocTypes = nonMetricDocTypes;
+var allDocTypes = ['run', 'iteration', 'sample', 'period', 'param', 'tag', 'metric_desc', 'metric_data'];
 var q = {};
 if (program.run) {
   q = { query: { bool: { filter: [{ term: { 'run.run-uuid': program.run } }] } } };
 }
-cdm.deleteMetrics(program.url, program.run);
-cdm.deleteDocs(program.url, nonMetricDocTypes, q);
-waitFor(nonMetricDocTypes);
+cdm.deleteDocs(program.url, allDocTypes, q);
+waitFor(allDocTypes);

From dd396ac412bd20d08ffdbb481c24cdb234b9b95d Mon Sep 17 00:00:00 2001
From: Andrew Theurer <atheurer@redhat.com>
Date: Fri, 22 Nov 2024 13:47:13 -0500
Subject: [PATCH 2/2] bugfix

---
 queries/cdmq/delete-run.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/cdmq/delete-run.js b/queries/cdmq/delete-run.js
index bd1ddfe0..e41aa8a0 100644
--- a/queries/cdmq/delete-run.js
+++ b/queries/cdmq/delete-run.js
@@ -10,6 +10,7 @@ program
 async function waitFor(docTypes) {
   var numAttempts = 1;
   var maxAttempts = 10;
+  var remainingDocTypes = docTypes;
   while (numAttempts <= maxAttempts && docTypes.length > 0) {
     let promise = new Promise((resolve, reject) => {
       setTimeout(() => resolve('done!'), 2000);