From 0c8bf1b3959db3e3b7828a5667be80990fcd26f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Thu, 20 Jun 2024 17:11:17 +0200
Subject: [PATCH] Move around some Sanity tests

Test sharing adjust definitions by having it once per subdirectory in
Sanity. Separate named for bind testing, utils for just bind-utils
testing. With the same working also for other bind variants.
---
 Sanity/caching-resolver-dnssec/main.fmf | 31 -------------------------
 Sanity/named/main.fmf                   |  2 ++
 Sanity/utils/main.fmf                   |  2 ++
 3 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 Sanity/caching-resolver-dnssec/main.fmf

diff --git a/Sanity/caching-resolver-dnssec/main.fmf b/Sanity/caching-resolver-dnssec/main.fmf
deleted file mode 100644
index 9fd6da0..0000000
--- a/Sanity/caching-resolver-dnssec/main.fmf
+++ /dev/null
@@ -1,31 +0,0 @@
-summary: Configure bind as caching and validating iterative resolver
-test: ./test.sh
-framework: beakerlib
-description: |
-  Configures named as a caching iterative resolver. Keep dnssec-validation enabled and try to
-  start resolution from root servers hints.
-
-  Test signed zones are validated and include ad bit. Check unsigned zones are
-  missing ad bit in responses. Requires public root-servers.net and other zone nameservers are directly accessible.
-recommend+:
-  - sed
-  - awk
-adjust:
-  - recommend+:
-      - bind
-      - bind-utils
-    environment+:
-      PACKAGE: bind
-    when: component is not defined or component == bind
-  - recommend+:
-      - bind9.16
-      - bind9.16-utils
-    environment+:
-      PACKAGE: bind9.16
-    when: component == bind9.16
-  - recommend+:
-      - bind9-next
-      - bind9-next-utils
-    environment+:
-      PACKAGE: bind9-next
-    when: component == bind9-next
diff --git a/Sanity/named/main.fmf b/Sanity/named/main.fmf
index ee5c028..56e49bc 100644
--- a/Sanity/named/main.fmf
+++ b/Sanity/named/main.fmf
@@ -1,3 +1,5 @@
+tags+:
+  - named
 adjust+:
   - require+:
       - bind
diff --git a/Sanity/utils/main.fmf b/Sanity/utils/main.fmf
index eea994f..3e38b4c 100644
--- a/Sanity/utils/main.fmf
+++ b/Sanity/utils/main.fmf
@@ -1,3 +1,5 @@
+tags+:
+  - utils
 adjust+:
   - require+:
       - bind-utils