From 87e2d28453c4036d209809d7cd8684d6b398e41b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Fri, 25 Aug 2023 15:14:41 +0200 Subject: [PATCH] Convert remaining tests to work with alternative components Expand adjusting based on components to more alternatives --- .../main.fmf | 21 +++++++++++++--- .../runtest.sh | 2 +- .../main.fmf | 24 +++++++++++++++---- .../runtest.sh | 2 +- .../main.fmf | 22 +++++++++++++---- .../runtest.sh | 2 +- Sanity/named-checkzone/main.fmf | 2 -- Smoke/IpaInstallAndStart/main.fmf | 6 +++-- .../main.fmf | 23 ++++++++++++++---- .../runtest.sh | 2 +- plans/ci.fmf | 2 ++ 11 files changed, 83 insertions(+), 25 deletions(-) diff --git a/Regression/bind-does-not-listen-on-all-addresses-over-TCP/main.fmf b/Regression/bind-does-not-listen-on-all-addresses-over-TCP/main.fmf index 77d3b4a..de86262 100644 --- a/Regression/bind-does-not-listen-on-all-addresses-over-TCP/main.fmf +++ b/Regression/bind-does-not-listen-on-all-addresses-over-TCP/main.fmf @@ -3,12 +3,9 @@ description: | Bug summary: bind does not listen on all addresses over TCP when listen-on/listen-on-v6 has specific IPs or any listed Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1999691 contact: Petr Sklenar -component: - - bind test: ./runtest.sh framework: beakerlib recommend: - - bind - lsof duration: 15m enabled: true @@ -21,6 +18,24 @@ adjust: - enabled: false when: distro == rhel-4, rhel-5 continue: false + - require+: + - bind + - bind-utils + environment+: + PACKAGE: bind + when: component is not defined or component == bind + - require+: + - bind9-next + - bind9-next-utils + environment+: + PACKAGE: bind9-next + when: component == bind9-next + - require+: + - bind9.16 + - bind9.16-utils + environment+: + PACKAGE: bind9.16 + when: component == bind9.16 extra-nitrate: TC#0612648 extra-summary: /CoreOS/bind/Regression/bind-does-not-listen-on-all-addresses-over-TCP extra-task: /CoreOS/bind/Regression/bind-does-not-listen-on-all-addresses-over-TCP diff --git a/Regression/bind-does-not-listen-on-all-addresses-over-TCP/runtest.sh b/Regression/bind-does-not-listen-on-all-addresses-over-TCP/runtest.sh index 4302be9..3b89f2c 100755 --- a/Regression/bind-does-not-listen-on-all-addresses-over-TCP/runtest.sh +++ b/Regression/bind-does-not-listen-on-all-addresses-over-TCP/runtest.sh @@ -28,7 +28,7 @@ # Include Beaker environment . /usr/share/beakerlib/beakerlib.sh || exit 1 -PACKAGE="bind" +: ${PACKAGE:="bind"} rlJournalStart rlPhaseStartSetup diff --git a/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/main.fmf b/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/main.fmf index bdd5d45..4c70332 100644 --- a/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/main.fmf +++ b/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/main.fmf @@ -3,15 +3,29 @@ description: | Bug summary: BIND stops DNSKEY lookup in get_dst_key() when a key with unsupported algorithm is found first Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1769876 contact: Petr Mensik -component: - - bind test: ./runtest.sh framework: beakerlib #require: # - library(bind/bind-utils) -recommend: - - bind - - bind-utils +adjust: + - require+: + - bind + - bind-utils + environment+: + PACKAGE: bind + when: component is not defined or component == bind + - require+: + - bind9-next + - bind9-next-utils + environment+: + PACKAGE: bind9-next + when: component == bind9-next + - require+: + - bind9.16 + - bind9.16-utils + environment+: + PACKAGE: bind9.16 + when: component == bind9.16 duration: 5m link: - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1769876 diff --git a/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/runtest.sh b/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/runtest.sh index 1beb4fe..114f115 100755 --- a/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/runtest.sh +++ b/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/runtest.sh @@ -28,7 +28,7 @@ # Include Beaker environment . /usr/share/beakerlib/beakerlib.sh || exit 1 -PACKAGE="bind" +: ${PACKAGE:="bind"} PHASE=${PHASE:-Test} rlJournalStart diff --git a/Regression/bz1848169-named-checkconf-cidr-host-bits/main.fmf b/Regression/bz1848169-named-checkconf-cidr-host-bits/main.fmf index ea78e6d..40087d9 100644 --- a/Regression/bz1848169-named-checkconf-cidr-host-bits/main.fmf +++ b/Regression/bz1848169-named-checkconf-cidr-host-bits/main.fmf @@ -1,12 +1,8 @@ summary: What the test does description: '' contact: Petr Sklenar -component: - - bind test: ./runtest.sh framework: beakerlib -recommend: - - bind duration: 5m enabled: true tag: @@ -19,6 +15,24 @@ adjust: - enabled: false when: distro != rhel-8 continue: false + - require+: + - bind + - bind-utils + environment+: + PACKAGE: bind + when: component is not defined or component == bind + - require+: + - bind9-next + - bind9-next-utils + environment+: + PACKAGE: bind9-next + when: component == bind9-next + - require+: + - bind9.16 + - bind9.16-utils + environment+: + PACKAGE: bind9.16 + when: component == bind9.16 extra-nitrate: TC#0608023 extra-summary: /CoreOS/bind/Regression/bz1848169-named-checkconf-cidr-host-bits extra-task: /CoreOS/bind/Regression/bz1848169-named-checkconf-cidr-host-bits diff --git a/Regression/bz1848169-named-checkconf-cidr-host-bits/runtest.sh b/Regression/bz1848169-named-checkconf-cidr-host-bits/runtest.sh index 6f37f77..f39c94a 100755 --- a/Regression/bz1848169-named-checkconf-cidr-host-bits/runtest.sh +++ b/Regression/bz1848169-named-checkconf-cidr-host-bits/runtest.sh @@ -28,7 +28,7 @@ # Include Beaker environment . /usr/share/beakerlib/beakerlib.sh || exit 1 -PACKAGE="bind" +: ${PACKAGE:="bind"} rlJournalStart rlPhaseStartSetup diff --git a/Sanity/named-checkzone/main.fmf b/Sanity/named-checkzone/main.fmf index 37abc7f..48ed354 100644 --- a/Sanity/named-checkzone/main.fmf +++ b/Sanity/named-checkzone/main.fmf @@ -1,8 +1,6 @@ summary: Sanity/named-checkzone description: '' contact: Petr Sklenar -component: - - bind test: ./runtest.sh framework: beakerlib duration: 5m diff --git a/Smoke/IpaInstallAndStart/main.fmf b/Smoke/IpaInstallAndStart/main.fmf index 28b4f57..9bf1327 100644 --- a/Smoke/IpaInstallAndStart/main.fmf +++ b/Smoke/IpaInstallAndStart/main.fmf @@ -3,5 +3,7 @@ test: ./test.sh framework: beakerlib duration: 68m contact: Petr Sklenar -component: - - bind +adjust: + - enabled: false + when: component != bind + because: freeipa is not supported with alternative components diff --git a/Stub/master-and-stub-server-talks-a-bit/main.fmf b/Stub/master-and-stub-server-talks-a-bit/main.fmf index 464bec8..2b6f19c 100644 --- a/Stub/master-and-stub-server-talks-a-bit/main.fmf +++ b/Stub/master-and-stub-server-talks-a-bit/main.fmf @@ -1,13 +1,8 @@ summary: sanity testing of stub server description: '' contact: Petr Sklenar -component: - - bind test: ./runtest.sh framework: beakerlib -recommend: - - bind - - bind-utils duration: 10m enabled: true tag: @@ -25,6 +20,24 @@ adjust: - enabled: false when: arch == ppc64le continue: false + - require+: + - bind + - bind-utils + environment+: + PACKAGE: bind + when: component is not defined or component == bind + - require+: + - bind9-next + - bind9-next-utils + environment+: + PACKAGE: bind9-next + when: component == bind9-next + - require+: + - bind9.16 + - bind9.16-utils + environment+: + PACKAGE: bind9.16 + when: component == bind9.16 extra-nitrate: TC#0518539 extra-summary: /CoreOS/bind/Stub/master-and-stub-server-talks-a-bit extra-task: /CoreOS/bind/Stub/master-and-stub-server-talks-a-bit diff --git a/Stub/master-and-stub-server-talks-a-bit/runtest.sh b/Stub/master-and-stub-server-talks-a-bit/runtest.sh index 1ba68a6..5cefade 100755 --- a/Stub/master-and-stub-server-talks-a-bit/runtest.sh +++ b/Stub/master-and-stub-server-talks-a-bit/runtest.sh @@ -28,7 +28,7 @@ # Include Beaker environment . /usr/share/beakerlib/beakerlib.sh || exit 1 -PACKAGE="bind" +: ${PACKAGE:="bind"} rlJournalStart rlPhaseStartSetup "base setup" diff --git a/plans/ci.fmf b/plans/ci.fmf index 239d93d..d646b66 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -4,3 +4,5 @@ discover: how: fmf execute: how: tmt +context: + component: bind