From 67eb9bb2882b3406a9e25912e5ec9762b88a9f07 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 14 Dec 2021 14:36:10 -0800
Subject: [PATCH] openqa/server: clean up and trim package requirements

Several of these requirements are old ones that were only needed
for createhdds, when we ran createhdds on the servers. All of
those can go. Also make the list line-by-line for easier git
blame tracking in future (and add comments for the remaining
entries so we know why they're there).

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 roles/openqa/server/files/createhdds |  4 ----
 roles/openqa/server/tasks/main.yml   | 20 ++++++++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)
 delete mode 100644 roles/openqa/server/files/createhdds

diff --git a/roles/openqa/server/files/createhdds b/roles/openqa/server/files/createhdds
deleted file mode 100644
index 794d80450e..0000000000
--- a/roles/openqa/server/files/createhdds
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd /var/lib/openqa/share/factory/hdd/fixed
-LIBGUESTFS_BACKEND=direct withlock /var/lock/createhdds.lock /root/createhdds/createhdds.py all --clean
diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index 2e9173f3d8..cdd9f3afb4 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -148,8 +148,11 @@
 # for these packages
 - name: Install openQA packages
   package:
-    name: ['openqa', 'openqa-httpd', 'openqa-plugin-fedora-messaging', 'openqa-plugin-fedoraupdaterestart',
-           'python3-fedfind']
+    name:
+      - openqa
+      - openqa-httpd
+      - openqa-plugin-fedora-messaging
+      - openqa-plugin-fedoraupdaterestart
     state: latest
     enablerepo: "{{ openqa_repo }}"
   tags:
@@ -157,10 +160,15 @@
 
 - name: Install various other required packages
   package:
-    name: ['python3-libselinux', 'git', 'jq', 'libselinux-utils', 'python3-libsemanage',
-           'nfs-utils', 'perl(Class::DBI::Pg)', 'expect', 'libguestfs-tools-c', 'libguestfs-xfs',
-           'libvirt-daemon-config-network', 'libvirt-python3', 'python3-libguestfs',
-           'virt-install', 'withlock', 'genisoimage']
+    name:
+      - python3-libselinux # for custom SELinux policy
+      - git # for checking out tests/tools
+      - jq # for checking if tests changed after template load
+      - libselinux-utils # custom SELinux policy
+      - python3-libsemanage # custom SELinux policy
+      - nfs-utils # for configuring/running NFS server
+      - perl(Class::DBI::Pg) # for using postgresql DB
+      - genisoimage # for building cloud-init ISO
     state: present
   tags:
   - packages