From 70030fd3e50ae073210cf60cc61d524c051978bb Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman Date: Fri, 16 Sep 2022 14:39:03 -0300 Subject: [PATCH 1/2] Azure CI: Update variable files instructions. Update instuctions on Azure template varible files to reflect the current test configuration behavior. --- tests/azure/templates/variables_c8s.yaml | 4 +++- tests/azure/templates/variables_c9s.yaml | 4 +++- tests/azure/templates/variables_centos-7.yaml | 4 +++- tests/azure/templates/variables_fedora-latest.yaml | 5 ++++- tests/azure/templates/variables_fedora-rawhide.yaml | 4 +++- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/tests/azure/templates/variables_c8s.yaml b/tests/azure/templates/variables_c8s.yaml index 586d5ecb..8fdc2819 100644 --- a/tests/azure/templates/variables_c8s.yaml +++ b/tests/azure/templates/variables_c8s.yaml @@ -5,11 +5,13 @@ # # Example: # -# disabled_modules: >- +# ipa_disabled_modules: >- # dnsconfig, # group, # hostgroup # +# If no variables are set, set "empty: true" as at least +# one item is needed in the set. --- variables: empty: true diff --git a/tests/azure/templates/variables_c9s.yaml b/tests/azure/templates/variables_c9s.yaml index 586d5ecb..8fdc2819 100644 --- a/tests/azure/templates/variables_c9s.yaml +++ b/tests/azure/templates/variables_c9s.yaml @@ -5,11 +5,13 @@ # # Example: # -# disabled_modules: >- +# ipa_disabled_modules: >- # dnsconfig, # group, # hostgroup # +# If no variables are set, set "empty: true" as at least +# one item is needed in the set. --- variables: empty: true diff --git a/tests/azure/templates/variables_centos-7.yaml b/tests/azure/templates/variables_centos-7.yaml index 8628af2e..4d29c2de 100644 --- a/tests/azure/templates/variables_centos-7.yaml +++ b/tests/azure/templates/variables_centos-7.yaml @@ -5,11 +5,13 @@ # # Example: # -# disabled_modules: >- +# ipa_disabled_modules: >- # dnsconfig, # group, # hostgroup # +# If no variables are set, set "empty: true" as at least +# one item is needed in the set. --- variables: # ipa_enabled_modules: >- diff --git a/tests/azure/templates/variables_fedora-latest.yaml b/tests/azure/templates/variables_fedora-latest.yaml index 04fb6d29..5f5de317 100644 --- a/tests/azure/templates/variables_fedora-latest.yaml +++ b/tests/azure/templates/variables_fedora-latest.yaml @@ -1,15 +1,18 @@ # +# # Variables must be defined as comma separated lists. # For easier management of items to enable/disable, # use one test/module on each line, followed by a comma. # # Example: # -# disabled_modules: >- +# ipa_disabled_modules: >- # dnsconfig, # group, # hostgroup # +# If no variables are set, set "empty: true" as at least +# one item is needed in the set. --- variables: # ipa_enabled_modules: >- diff --git a/tests/azure/templates/variables_fedora-rawhide.yaml b/tests/azure/templates/variables_fedora-rawhide.yaml index d412651b..a19c2e9a 100644 --- a/tests/azure/templates/variables_fedora-rawhide.yaml +++ b/tests/azure/templates/variables_fedora-rawhide.yaml @@ -5,11 +5,13 @@ # # Example: # -# disabled_modules: >- +# ipa_disabled_modules: >- # dnsconfig, # group, # hostgroup # +# If no variables are set, set "empty: true" as at least +# one item is needed in the set. --- variables: empty: true From 8d90c74b281b8d574abc279be771afcf06a1c80b Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman Date: Fri, 16 Sep 2022 14:56:02 -0300 Subject: [PATCH 2/2] Azure CI: Re-enable dnszone tests with forwarder ports As the latest versions of FreeIPA contain fixes to set the port on DNS forwarders, this patch re-enables the upstream tests. --- tests/azure/templates/variables_fedora-latest.yaml | 7 +++---- tests/azure/templates/variables_fedora-rawhide.yaml | 6 ++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/azure/templates/variables_fedora-latest.yaml b/tests/azure/templates/variables_fedora-latest.yaml index 5f5de317..59210e0d 100644 --- a/tests/azure/templates/variables_fedora-latest.yaml +++ b/tests/azure/templates/variables_fedora-latest.yaml @@ -15,9 +15,8 @@ # one item is needed in the set. --- variables: + empty: true # ipa_enabled_modules: >- # ipa_enabled_tests: >- - ipa_disabled_modules: >- - dnsforwardzone, - ipa_disabled_tests: >- - test_dnsconfig_forwarders_ports + # ipa_disabled_modules: >- + # ipa_disabled_tests: >- diff --git a/tests/azure/templates/variables_fedora-rawhide.yaml b/tests/azure/templates/variables_fedora-rawhide.yaml index a19c2e9a..ba8cc602 100644 --- a/tests/azure/templates/variables_fedora-rawhide.yaml +++ b/tests/azure/templates/variables_fedora-rawhide.yaml @@ -17,7 +17,5 @@ variables: empty: true # ipa_enabled_modules: >- # ipa_enabled_tests: >- - ipa_disabled_modules: >- - dnsforwardzone, - ipa_disabled_tests: >- - test_dnsconfig_forwarders_ports + # ipa_disabled_modules: >- + # ipa_disabled_tests: >-