From 5014fbcb98b2c4898fea7d4ffa6741efe9da3519 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 29 Sep 2025 14:34:56 -0400 Subject: [PATCH] qa/orch/cephadm/smb: add new smb.workunit tasks to some AD tests These tests will automatically use a user account from the known AD environment. Signed-off-by: John Mulligan --- .../orch/cephadm/smb/tasks/deploy_smb_mgr_domain.yaml | 11 +++++++++++ .../cephadm/smb/tasks/deploy_smb_mgr_res_dom.yaml | 11 +++++++++++ .../cephadm/smb/tasks/deploy_smb_proxy_disabled.yaml | 11 +++++++++++ .../cephadm/smb/tasks/deploy_smb_proxy_enabled.yaml | 11 +++++++++++ 4 files changed, 44 insertions(+) diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_domain.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_domain.yaml index 985eb4cf4f8a..ef084ae55a1b 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_domain.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_domain.yaml @@ -53,6 +53,17 @@ tasks: - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'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 + timeout: 1h + clients: + client.0: + - [default] + - cephadm.shell: host.a: - cmd: ceph smb share rm modtest1 share2 diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_dom.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_dom.yaml index 36f15575ee9b..077b3e7a704b 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_dom.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_dom.yaml @@ -82,6 +82,17 @@ tasks: - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'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 + timeout: 1h + clients: + client.0: + - [default] + - cephadm.shell: host.a: - cmd: ceph smb apply -i - diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_proxy_disabled.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_proxy_disabled.yaml index a7253328c29b..a633cccf4e01 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_proxy_disabled.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_proxy_disabled.yaml @@ -84,6 +84,17 @@ tasks: - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'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 + timeout: 1h + clients: + client.0: + - [default] + - exec: host.a: - | diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_proxy_enabled.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_proxy_enabled.yaml index 05001b67f684..03ba1cd48fc7 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_proxy_enabled.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_proxy_enabled.yaml @@ -84,6 +84,17 @@ tasks: - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'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 + timeout: 1h + clients: + client.0: + - [default] + - exec: host.a: - | -- 2.47.3