From fe9aa8732c17b16aeaccf331bc20dfc391fbbac2 Mon Sep 17 00:00:00 2001 From: Samuel Verschelde Date: Thu, 5 Sep 2024 20:51:27 +0200 Subject: [PATCH 1/2] Add temporary post-install jobs Signed-off-by: Samuel Verschelde --- jobs.py | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/jobs.py b/jobs.py index c4bd391e..7745d445 100755 --- a/jobs.py +++ b/jobs.py @@ -7,6 +7,62 @@ from lib.commands import ssh JOBS = { + "postinstall": { + "description": + "Minimal set of tests to run after an installation or an upgrade.", + "requirements": [ + "A pool master with a local SR. Can be a single-host pool.", + "A second one-host pool with a SR to receive cross-pool migrated VMs.", + "(If you can't provide a second pool, add `-m 'not hostB1'`, and specify the pool master of the first pool twice.)" + "Config in data.py for a NFS SR.", + "A VM (small and fast-booting).", + ], + "nb_pools": 2, + "params": { + "--vm": "single/small_vm", + }, + "paths": [ + "tests/xo/test_xo_connection.py", + "tests/misc", + "tests/system", + ], + "markers": "not hostA2 and (small_vm or no_vm) and not reboot and not complex_prerequisites and not sr_disk", + }, + "postinstall-intrapool-migrate": { + "description": + "Minimal intra-pool live-migrate tests to run after an installation or an upgrade.", + "requirements": [ + "A pool with at least 2 hosts and a shared SR in addition to local SRs on hosts. The shared SR is the default SR of the pool.", + "A VM (small and fast-booting).", + ], + "nb_pools": 1, + "params": { + "--vm": "single/small_vm", + }, + "paths": [ + "tests/misc/test_basic_without_ssh.py::TestBasicNoSSH::test_live_migrate", + ], + }, + "postinstall-with-tls": { + "description": + "Minimal set of tests to run after an installation or an upgrade, and after enabling TLS verification in the case of an upgrade. Includes a pool join test.", + "requirements": [ + "A pool with at least 2 hosts.", + "(If the pool has only one host, you can add `-m 'not hostA2'` parameter but this will skip the TLS verification test.)", + "A second one-host pool, without any shared storage, which will be temporarily joined to the first pool.", + "(If you can't provide a second pool, which is too bad because this skips pool join tests, add `-m 'not hostB1'`, and specify the pool master of the first pool twice.)", + "TLS verification enabled on both pools.", + "A VM (small and fast-booting).", + ], + "nb_pools": 2, + "params": { + "--vm": "single/small_vm", + }, + "paths": [ + "tests/xapi/tls_verification", + "tests/uefi_sb/test_varstored_cert_flow.py::TestPoolToDiskCertInheritanceOnPoolJoin", # because we want to test a pool join + ], + }, "main": { "description": "a group of not-too-long tests that run either without a VM, or with a single small one", "requirements": [ @@ -15,6 +71,7 @@ "An additional free disk on the first host.", "Config in data.py for another NFS SR.", "A VM (small and fast-booting).", + "On XCP-ng 8.3+: TLS verification must be enabled.", ], "nb_pools": 2, "params": { From 85cd76598b56399a5c83f5d3ec8cf5f51a2993ef Mon Sep 17 00:00:00 2001 From: Samuel Verschelde Date: Wed, 18 Sep 2024 10:22:11 +0200 Subject: [PATCH 2/2] fixup: only one pool required for postinstall job Signed-off-by: Samuel Verschelde --- jobs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs.py b/jobs.py index 7745d445..2481e3b8 100755 --- a/jobs.py +++ b/jobs.py @@ -17,7 +17,7 @@ "Config in data.py for a NFS SR.", "A VM (small and fast-booting).", ], - "nb_pools": 2, + "nb_pools": 1, "params": { "--vm": "single/small_vm", },