Drop obsolete --sr-disk* options and their use in jobs and examples

The old options had been missed and kept as no-op, which should not be
a problem for any caller using "auto" (which was anyway the only
sensible choice for a generic script).

Signed-off-by: Yann Dirson <[email protected]>

Author: ydirson

README.md

@@ -205,7 +205,7 @@ Here's an example of selection we can do thanks to the markers:
 
 ```
 # Run storage driver tests that either need no VM at all, or advise to use a small VM. Exclude tests that reboot the hosts.
-pytest tests/storage -m "(small_vm or no_vm) and not reboot" --hosts=ip_of_poolmaster1,ip_of_poolmaster2 --vm=http://path/to/a_small_vm.xva --sr-disk=auto
+pytest tests/storage -m "(small_vm or no_vm) and not reboot" --hosts=ip_of_poolmaster1,ip_of_poolmaster2 --vm=http://path/to/a_small_vm.xva
 ```
 
 Another example:

conftest.py

@@ -92,21 +92,6 @@ def pytest_addoption(parser):
              "DISKS is a possibly-empty comma-separated list. "
              "No mention of a given host authorizes use of all its disks."
     )
-    parser.addoption(
-        "--sr-disk",
-        action="append",
-        default=[],
-        help="Name of an available disk (sdb) or partition device (sdb2) to be formatted and used in storage tests. "
-             "Set it to 'auto' to let the fixtures auto-detect available disks."
-    )
-    parser.addoption(
-        "--sr-disk-4k",
-        action="append",
-        default=[],
-        help="Name of an available disk (sdb) or partition device (sdb2) with "
-             "4KiB blocksize to be formatted and used in storage tests. "
-             "Set it to 'auto' to let the fixtures auto-detect available disks."
-    )
 
 def pytest_configure(config):
     global_config.ignore_ssh_banner = config.getoption('--ignore-ssh-banner')

jobs.py

@@ -20,7 +20,6 @@
         "nb_pools": 2,
         "params": {
             "--vm": "single/small_vm",
-            "--sr-disk": "auto",
         },
         "paths": [
             "tests/misc",
@@ -46,7 +45,6 @@
         "nb_pools": 2,
         "params": {
             "--vm[]": "multi/all_unix",
-            "--sr-disk": "auto",
         },
         "paths": ["tests/misc", "tests/migration"],
         "markers": "multi_vms and not flaky and not reboot",
@@ -62,7 +60,6 @@
         "nb_pools": 2,
         "params": {
             "--vm[]": "multi/all_windows",
-            "--sr-disk": "auto",
         },
         "paths": ["tests/misc", "tests/migration"],
         "markers": "multi_vms and not flaky and not reboot",
@@ -88,7 +85,6 @@
         "nb_pools": 1,
         "params": {
             "--vm": "single/small_vm",
-            "--sr-disk": "auto",
         },
         "paths": ["tests/storage"],
         "markers": "(small_vm or no_vm) and not reboot and not quicktest and not unused_4k_disks",
@@ -106,7 +102,6 @@
         "nb_pools": 2,
         "params": {
             "--vm": "single/small_vm",
-            "--sr-disk": "auto",
         },
         "paths": ["tests/storage"],
         "markers": "not unused_4k_disks",
@@ -123,7 +118,6 @@
         "nb_pools": 1,
         "params": {
             "--vm": "single/small_vm",
-            "--sr-disk": "auto",
         },
         "paths": ["tests/storage"],
         "markers": "reboot and not flaky and not unused_4k_disks",
@@ -138,7 +132,6 @@
         ],
         "nb_pools": 1,
         "params": {
-            "--sr-disk": "auto",
         },
         "paths": ["tests/storage"],
         "markers": "quicktest and not unused_4k_disks",
@@ -154,7 +147,6 @@
         "nb_pools": 1,
         "params": {
             "--vm": "single/small_vm",
-            "--sr-disk": "auto",
         },
         "paths": ["tests/storage/linstor"],
         "markers": "(small_vm or no_vm) and not reboot and not quicktest",
@@ -171,7 +163,6 @@
         "nb_pools": 2,
         "params": {
             "--vm": "single/small_vm",
-            "--sr-disk": "auto",
         },
         "paths": ["tests/storage/linstor"],
         "markers": "",
@@ -187,7 +178,6 @@
         "nb_pools": 1,
         "params": {
             "--vm": "single/small_vm",
-            "--sr-disk": "auto",
         },
         "paths": ["tests/storage/linstor"],
         "markers": "reboot",
@@ -200,7 +190,6 @@
         ],
         "nb_pools": 1,
         "params": {
-            "--sr-disk": "auto",
         },
         "paths": ["tests/storage/linstor"],
         "markers": "quicktest",
@@ -215,7 +204,6 @@
         "nb_pools": 1,
         "params": {
             "--vm": "single/small_vm",
-            "--sr-disk-4k": "auto",
         },
         "paths": ["tests/storage"],
         "markers": "(small_vm or no_vm) and unused_4k_disks and not reboot and not quicktest",
@@ -232,7 +220,6 @@
         "nb_pools": 2,
         "params": {
             "--vm": "single/small_vm",
-            "--sr-disk-4k": "auto",
         },
         "paths": ["tests/storage"],
         "markers": "unused_4k_disks",
@@ -248,7 +235,6 @@
         "nb_pools": 1,
         "params": {
             "--vm": "single/small_vm",
-            "--sr-disk-4k": "auto",
         },
         "paths": ["tests/storage"],
         "markers": "unused_4k_disks and reboot",
@@ -261,7 +247,6 @@
         ],
         "nb_pools": 1,
         "params": {
-            "--sr-disk-4k": "auto",
         },
         "paths": ["tests/storage"],
         "markers": "unused_4k_disks and quicktest",
@@ -297,7 +282,6 @@
         # nb_pools left to 1 so that the job can run on XCP-ng 8.2 with just one pool, but 2 are required in 8.3+
         "nb_pools": 1,
         "params": {
-            "--sr-disk": "auto",
             "--vm": "single/small_vm_efitools",
         },
         "paths": ["tests/uefi_sb/test_uefistored_cert_flow.py", "tests/uefi_sb/test_varstored_cert_flow.py"],
@@ -420,7 +404,6 @@
         "nb_pools": 1,
         "params": {
             "--vm": "single/small_vm",
-            "--sr-disk": "auto",
         },
         "paths": ["tests"],
         "markers": "flaky",

tests/misc/test_export.py

@@ -4,9 +4,7 @@
 
 # Requirements:
 # From --hosts parameter:
-# - host: a XCP-ng host
-# From --sr-disk parameter:
-# - an additional unused disk to store the exported VM
+# - host: a XCP-ng host with an unused disk to store the exported VM
 # From --vm parameter:
 # - A VM to import and export
 

tests/storage/iso/test_local_iso_sr.py

@@ -12,9 +12,9 @@
 
 # Requirements:
 # From --hosts parameter:
-# - host: a XCP-ng host, with the default SR being either a shared SR, or a local SR on the master host
-# From --sr-disk parameter:
-# - an additional unused disk for the SR
+# - host: a XCP-ng host, with:
+#   - the default SR being either a shared SR, or a local SR on the master host
+#   - an additional unused disk for the SR
 # From --vm parameter:
 # - A VM to import
 

tests/storage/iso/test_local_iso_sr_reboot.py

@@ -8,9 +8,9 @@
 
 # Requirements:
 # From --hosts parameter:
-# - host: a XCP-ng host, with the default SR being either a shared SR, or a local SR on the master host
-# From --sr-disk parameter:
-# - an additional unused disk for the SR
+# - host: a XCP-ng host, with:
+#   - the default SR being either a shared SR, or a local SR on the master host
+#   - an additional unused disk for the SR
 # From --vm parameter:
 # - A VM to import
 

tests/uefi_sb/test_varstored_cert_flow.py

@@ -15,10 +15,9 @@
 # From --hosts parameter:
 # - host: XCP-ng host >= 8.3
 #   Master of a, at least, 2 hosts pool
+#   With a free disk
 # - hostB1: XCP-ng host >= 8.3
 #   This host will be joined and ejected from pool A, it means its state will be completely reinitialized from scratch
-# From --sr-disk parameter:
-# - a free disk on the first host.
 
 pytestmark = pytest.mark.default_vm('mini-linux-x86_64-uefi')