From fb62d0542eb36895fe8134f4456633e497fcc04d Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik@redhat.com>
Date: Mar 31 2020 18:54:44 +0000
Subject: [PATCH 1/7] Revert "Disable building of export-libs"


This reverts commit fac5ed036c0e601da3d1f40c1cfa78f401220cf8.

For rebase testing, export libs must still be built. Reenable them on
copr builds.

---

diff --git a/bind.spec b/bind.spec
index a0e9182..1afa499 100644
--- a/bind.spec
+++ b/bind.spec
@@ -21,7 +21,7 @@
 %bcond_without DNSTAP
 %bcond_without DLZ
 %bcond_with    BDB
-%bcond_with    EXPORT_LIBS
+%bcond_without EXPORT_LIBS
 # Legacy GeoIP support
 %bcond_with    GEOIP
 # New MaxMind GeoLite support

From 9a049f52a574cf90e58e50e8e1dedc55becf145b Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik@redhat.com>
Date: Mar 31 2020 18:54:44 +0000
Subject: [PATCH 2/7] Try to pass with modified branch


---

diff --git a/tests/tests.yml b/tests/tests.yml
index 15360ed..831b492 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -5,10 +5,14 @@
   - role: standard-test-beakerlib
     tags:
     - classic
-    tests:
-    - Master-server-chrooted
-    - Master-server-not-chrooted
-    - Run-internal-BIND-test-suite
+    repositories:
+    - repo: "https://github.com/InfrastructureServices/bind-tests.git"
+      dest: "bind-tests"
+      branch: "sanity-tests"
+#    tests:
+#    - bind-tests/Sanity/Master-server-chrooted
+#    - bind-tests/Sanity/Master-server-not-chrooted
+#    - bind-tests/Sanity/Run-internal-BIND-test-suite
     required_packages:
     - bind
     - bind-chroot

From 87a4c88ab46194778fe09380311eeaf622e6506f Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik@redhat.com>
Date: Mar 31 2020 18:54:44 +0000
Subject: [PATCH 3/7] Not sure how to specify tests to run


check https://fmf.readthedocs.io/en/latest/ for help

---

diff --git a/tests/tests.yml b/tests/tests.yml
index 831b492..c1d9468 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -9,10 +9,10 @@
     - repo: "https://github.com/InfrastructureServices/bind-tests.git"
       dest: "bind-tests"
       branch: "sanity-tests"
-#    tests:
-#    - bind-tests/Sanity/Master-server-chrooted
-#    - bind-tests/Sanity/Master-server-not-chrooted
-#    - bind-tests/Sanity/Run-internal-BIND-test-suite
+    tests:
+    - Master-server-chrooted
+    - Master-server-not-chrooted
+    - Run-internal-BIND-test-suite
     required_packages:
     - bind
     - bind-chroot

From 0cdc02957676b5566c92c38ee85a4c8dfaa73111 Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik@redhat.com>
Date: Apr 14 2020 07:13:43 +0000
Subject: [PATCH 4/7] Use fmf filter for test case selection


---

diff --git a/tests/tests.yml b/tests/tests.yml
index c1d9468..25d0a73 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -9,10 +9,7 @@
     - repo: "https://github.com/InfrastructureServices/bind-tests.git"
       dest: "bind-tests"
       branch: "sanity-tests"
-    tests:
-    - Master-server-chrooted
-    - Master-server-not-chrooted
-    - Run-internal-BIND-test-suite
+    fmf_filter: "tier: 1"
     required_packages:
     - bind
     - bind-chroot

From 8712637d4441ef960d27621a5234ffc2ee85fdf1 Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik@redhat.com>
Date: Apr 14 2020 07:55:27 +0000
Subject: [PATCH 5/7] Run master branch instead


---

diff --git a/tests/tests.yml b/tests/tests.yml
index 25d0a73..d7b998e 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -8,7 +8,7 @@
     repositories:
     - repo: "https://github.com/InfrastructureServices/bind-tests.git"
       dest: "bind-tests"
-      branch: "sanity-tests"
+      branch: "master"
     fmf_filter: "tier: 1"
     required_packages:
     - bind

From 93a93c1b79f254e3e4e64ab04eaffa1c3b70d4dd Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik@redhat.com>
Date: Apr 14 2020 09:12:10 +0000
Subject: [PATCH 6/7] Move filter to correct location


---

diff --git a/tests/tests.yml b/tests/tests.yml
index d7b998e..4b29060 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -9,7 +9,6 @@
     - repo: "https://github.com/InfrastructureServices/bind-tests.git"
       dest: "bind-tests"
       branch: "master"
-    fmf_filter: "tier: 1"
     required_packages:
     - bind
     - bind-chroot
@@ -25,3 +24,4 @@
     - softhsm
     - bind-pkcs11
     - bind-pkcs11-utils
+      fmf_filter: "tier: 1"

From 18e5113f58484f131b3c9f17d45d742988ab82bb Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik@redhat.com>
Date: Apr 14 2020 09:13:10 +0000
Subject: [PATCH 7/7] Cleanup test definition


Leave installation of dependencies on tests itself. Use beakerlib to
install packages.

---

diff --git a/tests/tests.yml b/tests/tests.yml
index 4b29060..c3d8fcd 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -8,20 +8,4 @@
     repositories:
     - repo: "https://github.com/InfrastructureServices/bind-tests.git"
       dest: "bind-tests"
-      branch: "master"
-    required_packages:
-    - bind
-    - bind-chroot
-    - bind-sdb-chroot
-    - redhat-lsb
-    - bind-utils
-    - dnf-utils
-    - kyua
-    - bind-devel
-    - perl-Net-DNS
-    - perl-Net-DNS-Nameserver
-    - perl-Time-HiRes
-    - softhsm
-    - bind-pkcs11
-    - bind-pkcs11-utils
       fmf_filter: "tier: 1"