Skip to content

Commit a2aec9c

Browse files
committed
Split the big main-multi job
* One job for Unix VMs * One job for Windows VMs * vm_data.py-dist's structure is updated accordingly Signed-off-by: Samuel Verschelde <[email protected]>
1 parent 4fbe63e commit a2aec9c

File tree

2 files changed

+24
-6
lines changed

2 files changed

+24
-6
lines changed

jobs.py

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,33 @@
3232
],
3333
"markers": "(small_vm or no_vm) and not flaky and not reboot and not complex_prerequisites",
3434
},
35-
"main-multi": {
36-
"description": "a group of tests that need to run on the largest variety of VMs",
35+
"main-multi-unix": {
36+
"description": "a group of tests that need to run on the largest variety of VMs - unix split",
3737
"requirements": [
3838
"A pool with at least 2 hosts, each with a local SR and a shared SR.",
3939
"An additional free disk on the first host.",
4040
"A second pool with a SR to receive migrated VMs.",
41-
"VMs of all sorts (unix, windows, HVM, PV, PV-shim, BIOS, UEFI...).",
41+
"Unix VMs of all sorts (HVM, PV, PV-shim, BIOS, UEFI...).",
4242
],
4343
"nb_pools": 2,
4444
"params": {
45-
"--vm[]": "multi/all",
45+
"--vm[]": "multi/all_unix",
46+
"--sr-disk": "auto",
47+
},
48+
"paths": ["tests/misc", "tests/migration"],
49+
"markers": "multi_vms and not flaky and not reboot",
50+
},
51+
"main-multi-windows": {
52+
"description": "a group of tests that need to run on the largest variety of VMs - windows split",
53+
"requirements": [
54+
"A pool with at least 2 hosts, each with a local SR and a shared SR.",
55+
"An additional free disk on the first host.",
56+
"A second pool with a SR to receive migrated VMs.",
57+
"Windows VMs of all sorts (HVM, PV, PV-shim, BIOS, UEFI...).",
58+
],
59+
"nb_pools": 2,
60+
"params": {
61+
"--vm[]": "multi/all_windows",
4662
"--sr-disk": "auto",
4763
},
4864
"paths": ["tests/misc", "tests/migration"],

vm_data.py-dist

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@ VMS = {
4040
"debian_uefi_vm": "",
4141
},
4242
"multi": {
43-
# all VMs we want to run "multi_vms" tests on
44-
"all": [],
43+
# all Unix VMs we want to run "multi_vms" tests on
44+
"all_unix": [],
45+
# all Windows VMs we want to run "multi_vms" tests on
46+
"all_windows": [],
4547
# VMs which support the installation of our unix guest tools from the ISO
4648
"tools_unix": [],
4749
# UEFI unix/linux Vms

0 commit comments

Comments
 (0)