From 7f4388b0debb302d7494ad4281b3ebc779e1239e Mon Sep 17 00:00:00 2001 From: Hideki Saito Date: Tue, 15 Sep 2026 16:24:09 +0900 Subject: [PATCH] [Backport][Stable-2] Backport #794 #796 (#797) * Replace FreeBSD version 14.4 with 14.5 for remote test (#796) Signed-off-by: Hideki Saito (cherry picked from commit d5699a3fcfca765b32f94b68a592139dc58d0301) * Fix integration test for mount module for Ansible Core 2.22 or later (#794) - Fixes #793 Signed-off-by: Hideki Saito (cherry picked from commit 93f25f88b8cd0243f53400697221a69d0f3e0dae) --------- Signed-off-by: Hideki Saito --- .azure-pipelines/azure-pipelines.yml | 4 ++-- changelogs/fragments/793_fix_mount_opts_no_log_assert.yml | 3 +++ changelogs/fragments/796_ci_bump_freebsd.yml | 4 ++++ tests/integration/targets/mount/tasks/main.yml | 8 +++++++- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 changelogs/fragments/793_fix_mount_opts_no_log_assert.yml create mode 100644 changelogs/fragments/796_ci_bump_freebsd.yml diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 28b61a2..61544da 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -275,8 +275,8 @@ stages: test: rhel/10.2 - name: RHEL 9.8 test: rhel/9.8 - - name: FreeBSD 14.4 - test: freebsd/14.4 + - name: FreeBSD 14.5 + test: freebsd/14.5 - name: FreeBSD 15.1 test: freebsd/15.1 diff --git a/changelogs/fragments/793_fix_mount_opts_no_log_assert.yml b/changelogs/fragments/793_fix_mount_opts_no_log_assert.yml new file mode 100644 index 0000000..0b59505 --- /dev/null +++ b/changelogs/fragments/793_fix_mount_opts_no_log_assert.yml @@ -0,0 +1,3 @@ +--- +trivial: + - Fix mount opts_no_log integration test for ansible-core 2.22 (https://github.com/ansible-collections/ansible.posix/issues/793). diff --git a/changelogs/fragments/796_ci_bump_freebsd.yml b/changelogs/fragments/796_ci_bump_freebsd.yml new file mode 100644 index 0000000..8c2220a --- /dev/null +++ b/changelogs/fragments/796_ci_bump_freebsd.yml @@ -0,0 +1,4 @@ +--- +trivial: + - CI - AZP replace FreeBSD version 14.4 with 14.5 for remote tests. +... diff --git a/tests/integration/targets/mount/tasks/main.yml b/tests/integration/targets/mount/tasks/main.yml index 8728d5f..2983834 100644 --- a/tests/integration/targets/mount/tasks/main.yml +++ b/tests/integration/targets/mount/tasks/main.yml @@ -1165,10 +1165,16 @@ opts: rw opts_no_log: true register: mount_info - - name: Assert opts_no_log option true + - name: Assert opts_no_log option true (ansible-core < 2.22) ansible.builtin.assert: that: - mount_info.opts == 'VALUE_SPECIFIED_IN_NO_LOG_PARAMETER' + when: ansible_version.full is ansible.builtin.version('2.22', '<') + - name: Assert opts_no_log option true (ansible-core >= 2.22) + ansible.builtin.assert: + that: + - mount_info.opts == 'rw' + when: ansible_version.full is ansible.builtin.version('2.22', '>=') - name: Remount the FS with opts_no_log option false ansible.posix.mount: path: /tmp/myfs