[PATCH] fstests: Make the use of "--badname" conditional

[PATCH] fstests: Make the use of "--badname" conditional

[cel]

From: Chuck Lever <chuck.lever@oracle.com>

RHEL 8 does not implement "useradd --badname". Use the --badname
option conditionally, based on OS family.

Reported-by: Scott Mayhew <smayhew@redhat.com>
Fixes: 08f095cf74f1 ("fstests: Enable creation of group "123456-fsgqa" on SuSE")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 playbooks/roles/fstests/defaults/main.yml                | 1 +
 playbooks/roles/fstests/tasks/install-deps/suse/main.yml | 4 ++++
 playbooks/roles/fstests/tasks/main.yml                   | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/playbooks/roles/fstests/defaults/main.yml b/playbooks/roles/fstests/defaults/main.yml
index 72100e934c39..302341420b58 100644
--- a/playbooks/roles/fstests/defaults/main.yml
+++ b/playbooks/roles/fstests/defaults/main.yml
@@ -12,6 +12,7 @@ infer_uid_and_group: False
 oscheck_extra_args: ""
 limit_tests: ""
 dynamic_limit_tests:
+badname_arg: ""
 
 fstests_start_after: False
 fstests_start_after_test: ""
diff --git a/playbooks/roles/fstests/tasks/install-deps/suse/main.yml b/playbooks/roles/fstests/tasks/install-deps/suse/main.yml
index 4520451dffbd..c4df15b9d677 100644
--- a/playbooks/roles/fstests/tasks/install-deps/suse/main.yml
+++ b/playbooks/roles/fstests/tasks/install-deps/suse/main.yml
@@ -247,3 +247,7 @@
   when:
     - repos_present|bool
     - fstests_fstyp == "cifs"
+
+- name: Set the "--badname" arg
+  ansible.builtin.set_fact:
+    badname_arg: "--badname"
diff --git a/playbooks/roles/fstests/tasks/main.yml b/playbooks/roles/fstests/tasks/main.yml
index 6a78ff0938de..68f94fe8ed3e 100644
--- a/playbooks/roles/fstests/tasks/main.yml
+++ b/playbooks/roles/fstests/tasks/main.yml
@@ -882,7 +882,7 @@
   become: yes
   become_flags: 'su - -c'
   become_method: sudo
-  ansible.builtin.command: "useradd --badname -d /home/{{ item }} -U {{ item }}"
+  ansible.builtin.command: "useradd {{ badname_arg }} -d /home/{{ item }} -U {{ item }}"
   with_items:
     - 123456-fsgqa
     - fsgqa

base-commit: 1599e4587893efc07569f97adf7430935b6cf31c
-- 
2.44.0

Re: [PATCH] fstests: Make the use of "--badname" conditional

[Scott Mayhew]

On Sun, 21 Apr 2024, cel@kernel.org wrote:

> From: Chuck Lever <chuck.lever@oracle.com>
> 
> RHEL 8 does not implement "useradd --badname". Use the --badname
> option conditionally, based on OS family.
> 
> Reported-by: Scott Mayhew <smayhew@redhat.com>
> Fixes: 08f095cf74f1 ("fstests: Enable creation of group "123456-fsgqa" on SuSE")
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

Thanks, that fixes the issue on RHEL8 for me.

Acked-by: Scott Mayhew <smayhew@redhat.com>

-Scott


> ---
>  playbooks/roles/fstests/defaults/main.yml                | 1 +
>  playbooks/roles/fstests/tasks/install-deps/suse/main.yml | 4 ++++
>  playbooks/roles/fstests/tasks/main.yml                   | 2 +-
>  3 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/playbooks/roles/fstests/defaults/main.yml b/playbooks/roles/fstests/defaults/main.yml
> index 72100e934c39..302341420b58 100644
> --- a/playbooks/roles/fstests/defaults/main.yml
> +++ b/playbooks/roles/fstests/defaults/main.yml
> @@ -12,6 +12,7 @@ infer_uid_and_group: False
>  oscheck_extra_args: ""
>  limit_tests: ""
>  dynamic_limit_tests:
> +badname_arg: ""
>  
>  fstests_start_after: False
>  fstests_start_after_test: ""
> diff --git a/playbooks/roles/fstests/tasks/install-deps/suse/main.yml b/playbooks/roles/fstests/tasks/install-deps/suse/main.yml
> index 4520451dffbd..c4df15b9d677 100644
> --- a/playbooks/roles/fstests/tasks/install-deps/suse/main.yml
> +++ b/playbooks/roles/fstests/tasks/install-deps/suse/main.yml
> @@ -247,3 +247,7 @@
>    when:
>      - repos_present|bool
>      - fstests_fstyp == "cifs"
> +
> +- name: Set the "--badname" arg
> +  ansible.builtin.set_fact:
> +    badname_arg: "--badname"
> diff --git a/playbooks/roles/fstests/tasks/main.yml b/playbooks/roles/fstests/tasks/main.yml
> index 6a78ff0938de..68f94fe8ed3e 100644
> --- a/playbooks/roles/fstests/tasks/main.yml
> +++ b/playbooks/roles/fstests/tasks/main.yml
> @@ -882,7 +882,7 @@
>    become: yes
>    become_flags: 'su - -c'
>    become_method: sudo
> -  ansible.builtin.command: "useradd --badname -d /home/{{ item }} -U {{ item }}"
> +  ansible.builtin.command: "useradd {{ badname_arg }} -d /home/{{ item }} -U {{ item }}"
>    with_items:
>      - 123456-fsgqa
>      - fsgqa
> 
> base-commit: 1599e4587893efc07569f97adf7430935b6cf31c
> -- 
> 2.44.0
> 
>