From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D8D0DF53 for ; Sun, 21 Apr 2024 20:50:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713732628; cv=none; b=LoRff4grktuRRhZVegEEJdTqTBQEw1kG1LqZYNHyivj3K3HSVt/3q5d8YyIr0zPGqsoYWvLMR/ZiX0y1Cg2Zuzzfle3XtOR3jtMu+t1abyuAvaO5G2gjKboThnMsBSWyJfuA9z9CIhuKNYAQSraNp/nyBDMbzaqzdXcuksNqNy8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713732628; c=relaxed/simple; bh=UY4eX9Z5RbOFmsqLqvfHaCr1r3Qx3X5V7M39YQjGtcQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=lZu+r9LgRkii/8+D0ohDPrJr5n+d/7SfFg2i0ys0LvL9QUlFdz71ScqfwhfN8weApWodSCB2EY79vKGSkVvcHLLCM0EycFKuA+zBjKhf+toEFM2pnEH77dH6vMGbwNHlf4jkMCcawLGX+jWfcMcXgCpKl89S+8EWx7Aqxo2qWtQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bbY+D44G; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bbY+D44G" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9ED51C113CE; Sun, 21 Apr 2024 20:50:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713732628; bh=UY4eX9Z5RbOFmsqLqvfHaCr1r3Qx3X5V7M39YQjGtcQ=; h=From:To:Cc:Subject:Date:From; b=bbY+D44G9bNkT7T9DeITI1/4FVbxE70dvIWvKlRQxcTJwnFyvkI5xFt+RR5ONpA83 WDSUQ3o5Gfs3t80fyNqjIWG6HOLdhZv8RxpH+afR4y+cREglflvVQ2bdUj1Ke2hvh3 AGSdFjidQie/YORGnA9vpA5tHPSyYKmfFLXySYDAP9Frmkg6Lj9GPwIhQBXEMo6aE/ 6DAEvBaSMiuff+PQ4NImTxRCxPa/rY9JOxsd06gYuA4bZcg6HKk+3BAd/8xLkVyYuY umeHJ9xVoKF9A2QjNPqbQqXvWPV7JgOETgu2+v/Qp1rxtXcjF0JdFq1py7M6uCKguh s79SilGJ30yig== From: cel@kernel.org To: Cc: Chuck Lever , Scott Mayhew Subject: [PATCH] fstests: Make the use of "--badname" conditional Date: Sun, 21 Apr 2024 16:50:17 -0400 Message-ID: <20240421205017.390717-1-cel@kernel.org> X-Mailer: git-send-email 2.44.0 Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chuck Lever RHEL 8 does not implement "useradd --badname". Use the --badname option conditionally, based on OS family. Reported-by: Scott Mayhew Fixes: 08f095cf74f1 ("fstests: Enable creation of group "123456-fsgqa" on SuSE") Signed-off-by: Chuck Lever --- 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