From f3b42f85fe88084b40219506ab2274a4f7bc3f31 Mon Sep 17 00:00:00 2001 From: Petr Menšík Date: Apr 14 2020 09:37:49 +0000 Subject: [PATCH 1/6] 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 93e0db889f86aca78fc08c32bc044712c071cf3d Mon Sep 17 00:00:00 2001 From: Petr Menšík Date: Apr 14 2020 09:37:49 +0000 Subject: [PATCH 2/6] 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 2e8a3a9146776de4f0d6fe266d18276f11b45c7c Mon Sep 17 00:00:00 2001 From: Petr Menšík Date: Apr 14 2020 09:37:49 +0000 Subject: [PATCH 3/6] 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 ce9edd09af2c94129be7ccee560bb22ffa527fd5 Mon Sep 17 00:00:00 2001 From: Petr Menšík Date: Apr 14 2020 09:37:49 +0000 Subject: [PATCH 4/6] 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 449ff581adf9ac4dd74d4657a8b9efdf30f87c21 Mon Sep 17 00:00:00 2001 From: Petr Menšík Date: Apr 14 2020 09:37:49 +0000 Subject: [PATCH 5/6] 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 485d16a77ea319f1da091d798ac2a926d025e882 Mon Sep 17 00:00:00 2001 From: Petr Menšík Date: Apr 14 2020 09:37:49 +0000 Subject: [PATCH 6/6] 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"