tentacle: only add package tasks if rocky is the final distro

The `fs` suite sometimes overrides the distro for testing the kclient.
The dnf commands fail on Ubuntu.

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>

diff --git a/qa/distros/all/rocky_10.yaml b/qa/distros/all/rocky_10.yaml
index cec934be35a3b6d68a322b9d25607091507e9951..b4e37502ea668e213c5f5552153d3c00501699f1 100644 (file)
--- a/qa/distros/all/rocky_10.yaml
+++ b/qa/distros/all/rocky_10.yaml
@@ -4,9 +4,22 @@ overrides:
   selinux:
     allowlist:
       - 'comm="systemd".*denied.*\{ prog_run \}.*tclass=bpf.*permissive=1'
-tasks:
-- pexec:
-    all:
-    # for https://tracker.ceph.com/issues/73823
-    - sudo dnf remove nvme-cli -y
-    - sudo dnf install nvmetcli nvme-cli -y
+teuthology:
+  postmerge:
+    - |
+      if yaml.os_type == 'rocky' then
+        local pexec_tasks = yaml_load([[
+        - pexec:
+            all:
+            # for https://tracker.ceph.com/issues/73823
+            - sudo dnf remove nvme-cli -y
+            - sudo dnf install nvmetcli nvme-cli -y
+        ]])
+        
+        -- Ensure the tasks array exists before attempting to merge
+        if yaml.tasks == nil then
+          yaml.tasks = py_list()
+        end
+        
+        deep_merge(yaml.tasks, pexec_tasks)
+      end

diff --git a/qa/distros/all/rocky_9.yaml b/qa/distros/all/rocky_9.yaml
index 0048bdcb41a9936652af8cf86e65eb8c7af64db7..ae5e4816d3821966f42f6e51408dfd66d9f2e145 100644 (file)
--- a/qa/distros/all/rocky_9.yaml
+++ b/qa/distros/all/rocky_9.yaml
@@ -1,8 +1,21 @@
 os_type: rocky
 os_version: "9.6"
-tasks:
-- pexec:
-    all:
-    # for https://tracker.ceph.com/issues/73823
-    - sudo dnf remove nvme-cli -y
-    - sudo dnf install nvmetcli nvme-cli -y
+teuthology:
+  postmerge:
+    - |
+      if yaml.os_type == 'rocky' then
+        local pexec_tasks = yaml_load([[
+        - pexec:
+            all:
+            # for https://tracker.ceph.com/issues/73823
+            - sudo dnf remove nvme-cli -y
+            - sudo dnf install nvmetcli nvme-cli -y
+        ]])
+        
+        -- Ensure the tasks array exists before attempting to merge
+        if yaml.tasks == nil then
+          yaml.tasks = py_list()
+        end
+        
+        deep_merge(yaml.tasks, pexec_tasks)
+      end