Merge d2bdca837b into 0847977d12

Warn only when zones were ignored in firewalld_info (#504 )
* warn only when zones were ignored * add changelog 504-firewalld_info-warning
2026-01-12 23:55:19 +01:00 · 2024-01-09 16:08:13 -06:00 · 2024-01-09 16:07:58 -06:00 · 2024-01-09 16:06:26 -06:00 · 2024-01-09 18:43:25 +00:00 · 2024-01-09 07:30:04 +01:00
5 changed files with 7 additions and 17 deletions
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@ -211,8 +211,6 @@ stages:
              test: rhel/9.1
            - name: FreeBSD 13.2
              test: freebsd/13.2
-            - name: FreeBSD 12.4
-              test: freebsd/12.4
  - stage: Remote_2_14
    displayName: Remote 2.14
    dependsOn: []
@ -227,8 +225,6 @@ stages:
              test: rhel/8.6
            - name: FreeBSD 13.2
              test: freebsd/13.2
-            - name: FreeBSD 12.4
-              test: freebsd/12.4

  ## Finally

--- a/changelogs/fragments/504-firewalld_info-warning.yaml
+++ b/changelogs/fragments/504-firewalld_info-warning.yaml
@ -0,0 +1,2 @@
+minor_changes:
+  - firewalld_info - Only warn about ignored zones, when there are zones ignored.
--- a/plugins/modules/firewalld_info.py
+++ b/plugins/modules/firewalld_info.py
@ -356,8 +356,9 @@ def main():
            specified_zones = module.params['zones']
            collect_zones = list(set(specified_zones) & set(all_zones))
            ignore_zones = list(set(specified_zones) - set(collect_zones))
-            warn.append(
-                'Please note: zone:(%s) have been ignored in the gathering process.' % ','.join(ignore_zones))
+            if ignore_zones:
+                warn.append(
+                    'Please note: zone:(%s) have been ignored in the gathering process.' % ','.join(ignore_zones))
        else:
            collect_zones = get_all_zones(client)

--- a/plugins/modules/mount.py
+++ b/plugins/modules/mount.py
@ -831,7 +831,7 @@ def main():
        # handle mount on boot.  To avoid mount option conflicts, if 'noauto'
        # specified in 'opts',  mount module will ignore 'boot'.
        opts = args['opts'].split(',')
-        if 'noauto' in opts:
+        if module.params['boot'] and 'noauto' in opts:
            args['warnings'].append("Ignore the 'boot' due to 'opts' contains 'noauto'.")
        elif not module.params['boot']:
            args['boot'] = 'no'
--- a/tests/utils/shippable/shippable.sh
+++ b/tests/utils/shippable/shippable.sh
@ -62,16 +62,7 @@ else
    retry pip install "https://github.com/ansible/ansible/archive/stable-${ansible_version}.tar.gz" --disable-pip-version-check
 fi

-if [ "${SHIPPABLE_BUILD_ID:-}" ]; then
-    export ANSIBLE_COLLECTIONS_PATHS="${HOME}/.ansible"
-    SHIPPABLE_RESULT_DIR="$(pwd)/shippable"
-    TEST_DIR="${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/ansible/posix"
-    mkdir -p "${TEST_DIR}"
-    cp -aT "${SHIPPABLE_BUILD_DIR}" "${TEST_DIR}"
-    cd "${TEST_DIR}"
-else
-    export ANSIBLE_COLLECTIONS_PATHS="${PWD}/../../../"
-fi
+export ANSIBLE_COLLECTIONS_PATHS="${PWD}/../../../"

 # START: HACK install dependencies
 if [ "${ansible_version}" == "2.9" ] || [ "${ansible_version}" == "2.10" ]; then
Author	SHA1	Message	Date
Petr Lautrbach	af2635cbf6	Merge `d2bdca837b` into `0847977d12`	2024-01-09 16:08:13 -06:00
Michael	0847977d12	Warn only when zones were ignored in firewalld_info (#504 ) * warn only when zones were ignored * add changelog 504-firewalld_info-warning	2024-01-09 16:07:58 -06:00
Christer Warén	2a1fb334ee	mount: edit boot parameters warning condition (#523 ) the CI failures are unrelated and shouldn't even be showing up ... I'm going to sort that out separately but that doesn't need to prevent this merge, all relevant CI tests passed	2024-01-09 16:06:26 -06:00
softwarefactory-project-zuul[bot]	af870d0b83	Merge pull request #524 from felixfontein/fix-ci Fix CI issues SUMMARY Sanity tests fail; remove problematic Shippable-specific parts of shippable.sh script. FreeBSD 12.4 have apparently been removed also from older versions of ansible-test. ISSUE TYPE Test Pull Request COMPONENT NAME CI	2024-01-09 18:43:25 +00:00
Felix Fontein	8e900e5218	Support for FreeBSD 12.4 was removed.	2024-01-09 07:30:04 +01:00
Felix Fontein	45d8819b7c	Remove Shippable leftovers.	2024-01-09 07:25:45 +01:00