fs/samba: restructure and expand test collection

All workloads on samba, samba+fuse, samba+kernel.  Workloads include
torture and cifs + {various workunits}

diff --git a/suites/fs/samba/install/install.yaml b/suites/fs/samba/install/install.yaml
new file mode 100644 (file)
index 0000000..12f1e85
--- /dev/null
+++ b/suites/fs/samba/install/install.yaml
@@ -0,0 +1,6 @@
+tasks:
+- install:
+- install:
+    project: samba
+    extra_packages: ['samba']
+- ceph:

diff --git a/suites/fs/samba/mount/fuse.yaml b/suites/fs/samba/mount/fuse.yaml
new file mode 100644 (file)
index 0000000..d00ffdb
--- /dev/null
+++ b/suites/fs/samba/mount/fuse.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph-fuse: [client.0]
+- samba:
+    samba.0:
+      ceph: "{testdir}/mnt.0"
+

diff --git a/suites/fs/samba/mount/kclient.yaml b/suites/fs/samba/mount/kclient.yaml
new file mode 100644 (file)
index 0000000..56590ad
--- /dev/null
+++ b/suites/fs/samba/mount/kclient.yaml
@@ -0,0 +1,6 @@
+tasks:
+- kclient: [client.0]
+- samba:
+    samba.0:
+      ceph: "{testdir}/mnt.0"
+

diff --git a/suites/fs/samba/mount/native.yaml b/suites/fs/samba/mount/native.yaml
new file mode 100644 (file)
index 0000000..09b8c1c
--- /dev/null
+++ b/suites/fs/samba/mount/native.yaml
@@ -0,0 +1,2 @@
+tasks:
+- samba:

diff --git a/suites/fs/samba/tasks/cifs_on_cephfuse_workunit_suites_fsstress.yaml b/suites/fs/samba/tasks/cifs_on_cephfuse_workunit_suites_fsstress.yaml
deleted file mode 100644 (file)
index 827caff..0000000
--- a/suites/fs/samba/tasks/cifs_on_cephfuse_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-tasks:
-- install:
-- install:
-    project: samba
-    extra_packages: ['samba']
-- ceph:
-- ceph-fuse: [client.0]
-- samba:
-    samba.0:
-      cephfuse: "{testdir}/mnt.0"
-- cifs-mount:
-    client.1:
-      share: cephfuse
-- workunit:
-    clients:
-      client.1:
-        - suites/fsstress.sh

diff --git a/suites/fs/samba/tasks/cifs_workunit_suites_fsstress.yaml b/suites/fs/samba/tasks/cifs_workunit_suites_fsstress.yaml
deleted file mode 100644 (file)
index 7e2d5f1..0000000
--- a/suites/fs/samba/tasks/cifs_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- install:
-- install:
-    project: samba
-    extra_packages: ['samba']
-- ceph:
-- samba:
-- cifs-mount: [client.0]
-- workunit:
-    clients:
-      client.0:
-        - suites/fsstress.sh

diff --git a/suites/fs/samba/tasks/smbtorture_tests.yaml b/suites/fs/samba/tasks/smbtorture_tests.yaml
deleted file mode 100644 (file)
index ce73e15..0000000
--- a/suites/fs/samba/tasks/smbtorture_tests.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-tasks:
-- install:
-- install:
-    project: samba
-    extra_packages: ['samba']
-- ceph:
-- samba:
-- pexec:
-    client.0:
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.lock
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.fdpass
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.unlink
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.attr
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.trans2
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.negnowait
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.dir1
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.deny1
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.deny2
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.deny3
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.denydos
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.ntdeny1
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.ntdeny2
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.tcon
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.tcondev
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.vuid
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.rw1
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.open
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.defer_open
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.xcopy
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.rename
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.properties
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.mangle
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.openattr
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.chkpath
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.secleak
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.disconnect
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.samba3error
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.smb
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.bench-holdcon
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.bench-holdopen
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.bench-readwrite
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.bench-torture
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.scan-pipe_number
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.scan-ioctl
-      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.scan-maxfid

diff --git a/suites/fs/samba/workload/cifs-dbench.yaml b/suites/fs/samba/workload/cifs-dbench.yaml
new file mode 100644 (file)
index 0000000..c13c1c0
--- /dev/null
+++ b/suites/fs/samba/workload/cifs-dbench.yaml
@@ -0,0 +1,8 @@
+tasks:
+- cifs-mount:
+    client.1:
+      share: ceph
+- workunit:
+    clients:
+      client.1:
+        - suites/dbench.sh

diff --git a/suites/fs/samba/workload/cifs-fsstress.yaml b/suites/fs/samba/workload/cifs-fsstress.yaml
new file mode 100644 (file)
index 0000000..ff003af
--- /dev/null
+++ b/suites/fs/samba/workload/cifs-fsstress.yaml
@@ -0,0 +1,8 @@
+tasks:
+- cifs-mount:
+    client.1:
+      share: ceph
+- workunit:
+    clients:
+      client.1:
+        - suites/fsstress.sh

diff --git a/suites/fs/samba/workload/cifs-kernel-build.yaml b/suites/fs/samba/workload/cifs-kernel-build.yaml
new file mode 100644 (file)
index 0000000..ab9ff8a
--- /dev/null
+++ b/suites/fs/samba/workload/cifs-kernel-build.yaml
@@ -0,0 +1,9 @@
+tasks:
+- cifs-mount:
+    client.1:
+      share: ceph
+- workunit:
+    clients:
+      client.1:
+        - kernel_untar_build.sh
+

diff --git a/suites/fs/samba/workload/cifs-tiobench.yaml b/suites/fs/samba/workload/cifs-tiobench.yaml
new file mode 100644 (file)
index 0000000..aed7572
--- /dev/null
+++ b/suites/fs/samba/workload/cifs-tiobench.yaml
@@ -0,0 +1,8 @@
+tasks:
+- cifs-mount:
+    client.1:
+      share: ceph
+- workunit:
+    clients:
+      client.1:
+        - suites/tiobench.sh

diff --git a/suites/fs/samba/workload/smbtorture.yaml b/suites/fs/samba/workload/smbtorture.yaml
new file mode 100644 (file)
index 0000000..22a51e0
--- /dev/null
+++ b/suites/fs/samba/workload/smbtorture.yaml
@@ -0,0 +1,39 @@
+tasks:
+- pexec:
+    client.1:
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.lock
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.fdpass
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.unlink
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.attr
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.trans2
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.negnowait
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.dir1
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.deny1
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.deny2
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.deny3
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.denydos
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.ntdeny1
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.ntdeny2
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.tcon
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.tcondev
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.vuid
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.rw1
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.open
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.defer_open
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.xcopy
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.rename
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.properties
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.mangle
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.openattr
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.chkpath
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.secleak
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.disconnect
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.samba3error
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.smb
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.bench-holdcon
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.bench-holdopen
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.bench-readwrite
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.bench-torture
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.scan-pipe_number
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.scan-ioctl
+      - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.scan-maxfid