From: John Mulligan Date: Mon, 29 Sep 2025 18:34:56 +0000 (-0400) Subject: qa/orch/cephadm/smb: add new smb.workunit tasks to some AD tests X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=77b9840af1c6d61e1910441ce015c6e4a2a1b6b2;p=ceph-ci.git 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 --- 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 985eb4cf4f8..ef084ae55a1 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 36f15575ee9..077b3e7a704 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_mgr_res_ports.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_ports.yaml index 65402886c2a..865c7838097 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_ports.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_ports.yaml @@ -85,6 +85,17 @@ tasks: - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -p4455 -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -p4455 -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 a7253328c29..a633cccf4e0 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 05001b67f68..03ba1cd48fc 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: - |