From d8176b4787d17c585d738138c2090a08567ab887 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 1 Dec 2025 11:03:40 -0500 Subject: [PATCH] qa/orch/cephadm/smb: add new smb.workunit task (non-AD) Add some instances of the new smb workunit wrapper to a couple of non-AD tests that require the user name and password to be explicitly provided. Signed-off-by: John Mulligan --- .../cephadm/smb/tasks/deploy_smb_mgr_basic.yaml | 16 ++++++++++++++++ .../smb/tasks/deploy_smb_mgr_res_basic.yaml | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_basic.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_basic.yaml index 94033e59fb5..97dbc077126 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_basic.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_basic.yaml @@ -52,6 +52,22 @@ tasks: - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user1%t3stP4ss1 //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user2%t3stP4ss2 //{{'host.a'|role_to_remote|attr('ip_address')}}/share2 -c ls" +- smb.workunit: + admin_node: host.a + smb_nodes: [host.a] + smb_shares: + - share1 + - share2 + smb_users: + - username: user1 + password: t3stP4ss1 + - username: user2 + password: t3stP4ss2 + timeout: 1h + clients: + client.0: + - [default] + - cephadm.shell: host.a: - cmd: ceph smb share rm modusr1 share2 diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_basic.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_basic.yaml index 99f145f9d98..3dd2ab26ca9 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_basic.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_basic.yaml @@ -79,6 +79,22 @@ tasks: - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user1%t3stP4ss1 //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user2%t3stP4ss2 //{{'host.a'|role_to_remote|attr('ip_address')}}/share2 -c ls" +- smb.workunit: + admin_node: host.a + smb_nodes: [host.a] + smb_shares: + - share1 + - share2 + smb_users: + - username: user1 + password: t3stP4ss1 + - username: user2 + password: t3stP4ss2 + timeout: 1h + clients: + client.0: + - [default] + - cephadm.shell: host.a: - cmd: ceph smb apply -i - -- 2.47.3