From 94956e7750ade5564f4464af3b81d7fa674cba7e Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Tue, 19 Dec 2023 16:56:19 -0500
Subject: [PATCH] tmt: Use declarative syntax for package dependencies

This makes things just a bit cleaner.
---
 tmt/plans/build-gnome.fmf   | 15 ++++++++++++++-
 tmt/plans/build-kde.fmf     | 15 ++++++++++++++-
 tmt/plans/build-minimal.fmf | 15 ++++++++++++++-
 tmt/plans/build-server.fmf  | 15 ++++++++++++++-
 4 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/tmt/plans/build-gnome.fmf b/tmt/plans/build-gnome.fmf
index b967251..c8388c4 100644
--- a/tmt/plans/build-gnome.fmf
+++ b/tmt/plans/build-gnome.fmf
@@ -1,10 +1,23 @@
 summary: Build GNOME image
+prepare:
+  - name: install packages
+    how: install
+    package:
+      - distribution-gpg-keys
+      - fatcat
+      - git-core
+      - kiwi
+      - libselinux-utils
+      - p7zip-plugins
+      - python3-boto3
+      - rpmdistro-repoquery
+      - zip
+      - zstd
 discover:
     how: shell
     tests:
       - name: build image
         test: |
-          dnf --assumeyes install fatcat git-core kiwi distribution-gpg-keys p7zip-plugins python3-boto3 zip zstd libselinux-utils rpmdistro-repoquery
           setenforce 0
           $TMT_TREE/builder.py build gnome
           $TMT_TREE/builder.py package gnome
diff --git a/tmt/plans/build-kde.fmf b/tmt/plans/build-kde.fmf
index bc9c1e3..54def45 100644
--- a/tmt/plans/build-kde.fmf
+++ b/tmt/plans/build-kde.fmf
@@ -1,10 +1,23 @@
 summary: Build KDE image
+prepare:
+  - name: install packages
+    how: install
+    package:
+      - distribution-gpg-keys
+      - fatcat
+      - git-core
+      - kiwi
+      - libselinux-utils
+      - p7zip-plugins
+      - python3-boto3
+      - rpmdistro-repoquery
+      - zip
+      - zstd
 discover:
     how: shell
     tests:
       - name: build image
         test: |
-          dnf --assumeyes install fatcat git-core kiwi distribution-gpg-keys p7zip-plugins python3-boto3 zip zstd libselinux-utils rpmdistro-repoquery
           setenforce 0
           $TMT_TREE/builder.py build kde
           $TMT_TREE/builder.py package kde
diff --git a/tmt/plans/build-minimal.fmf b/tmt/plans/build-minimal.fmf
index 021d9bd..44cb471 100644
--- a/tmt/plans/build-minimal.fmf
+++ b/tmt/plans/build-minimal.fmf
@@ -1,10 +1,23 @@
 summary: Build Minimal image
+prepare:
+  - name: install packages
+    how: install
+    package:
+      - distribution-gpg-keys
+      - fatcat
+      - git-core
+      - kiwi
+      - libselinux-utils
+      - p7zip-plugins
+      - python3-boto3
+      - rpmdistro-repoquery
+      - zip
+      - zstd
 discover:
     how: shell
     tests:
       - name: build image
         test: |
-          dnf --assumeyes install fatcat git-core kiwi distribution-gpg-keys p7zip-plugins python3-boto3 zip zstd libselinux-utils rpmdistro-repoquery
           setenforce 0
           $TMT_TREE/builder.py build minimal
           $TMT_TREE/builder.py package minimal
diff --git a/tmt/plans/build-server.fmf b/tmt/plans/build-server.fmf
index 7e847ef..25ba08f 100644
--- a/tmt/plans/build-server.fmf
+++ b/tmt/plans/build-server.fmf
@@ -1,10 +1,23 @@
 summary: Build Server image
+prepare:
+  - name: install packages
+    how: install
+    package:
+      - distribution-gpg-keys
+      - fatcat
+      - git-core
+      - kiwi
+      - libselinux-utils
+      - p7zip-plugins
+      - python3-boto3
+      - rpmdistro-repoquery
+      - zip
+      - zstd
 discover:
     how: shell
     tests:
       - name: build image
         test: |
-          dnf --assumeyes install fatcat git-core kiwi distribution-gpg-keys p7zip-plugins python3-boto3 zip zstd libselinux-utils rpmdistro-repoquery
           setenforce 0
           $TMT_TREE/builder.py build server
           $TMT_TREE/builder.py package server