From e5f15001448a3cc2cf1b2181ea02cd7b4e03fc56 Mon Sep 17 00:00:00 2001 From: Nicholas Piggin Date: Fri, 29 Dec 2023 22:24:14 +1000 Subject: tests/avocado: mark boot_linux.py long runtime instead of flaky MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ppc64 and s390x tests were first marked skipIf GITLAB_CI by commit c0c8687ef0f ("tests/avocado: disable BootLinuxPPC64 test in CI"), and commit 0f26d94ec9e ("tests/acceptance: skip s390x_ccw_vrtio_tcg on GitLab") due to being very heavy-weight for gitlab CI. Commit 9b45cc99318 ("docs/devel: rationalise unstable gitlab tests under FLAKY_TESTS") changed this to being flaky but it isn't really, it just had a long runtime. So take the SPEED=slow variable from qtests and introduce it to avocado, and make these tests require it. Reviewed-by: Cédric Le Goater Signed-off-by: Nicholas Piggin --- docs/devel/testing.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'docs') diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index aa96eacec5..fa28e3ecb2 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -1346,6 +1346,17 @@ the environment. The definition of *large* is a bit arbitrary here, but it usually means an asset which occupies at least 1GB of size on disk when uncompressed. +SPEED +^^^^^ +Tests which have a long runtime will not be run unless ``SPEED=slow`` is +exported on the environment. + +The definition of *long* is a bit arbitrary here, and it depends on the +usefulness of the test too. A unique test is worth spending more time on, +small variations on existing tests perhaps less so. As a rough guide, +a test or set of similar tests which take more than 100 seconds to +complete. + AVOCADO_ALLOW_UNTRUSTED_CODE ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ There are tests which will boot a kernel image or firmware that can be -- cgit 1.4.1 From 1392617d35765d5d912625fbb5cab1ffbed8e140 Mon Sep 17 00:00:00 2001 From: Cédric Le Goater Date: Tue, 23 Jan 2024 16:37:02 +1000 Subject: spapr: Tag pseries-2.1 - 2.11 machines as deprecated MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pseries machines before version 2.11 have undergone many changes to correct issues, mostly regarding migration compatibility. This is obfuscating the code uselessly and makes maintenance more difficult. Remove them and only keep the last version of the 2.x series, 2.12, still in use by old distros. Reviewed-by: Thomas Huth Reviewed-by: Daniel Henrique Barboza Signed-off-by: Cédric Le Goater Signed-off-by: Nicholas Piggin --- docs/about/deprecated.rst | 8 ++++++++ hw/ppc/spapr.c | 1 + roms/skiboot | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 5a2305ccd6..36bd3e15ef 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -229,6 +229,14 @@ The Nios II architecture is orphan. The machine is no longer in existence and has been long unmaintained in QEMU. This also holds for the TC51828 16MiB flash that it uses. +``pseries-2.1`` up to ``pseries-2.11`` (since 9.0) +'''''''''''''''''''''''''''''''''''''''''''''''''' + +Older pseries machines before version 2.12 have undergone many changes +to correct issues, mostly regarding migration compatibility. These are +no longer maintained and removing them will make the code easier to +read and maintain. Use versions 2.12 and above as a replacement. + Backend options --------------- diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b442d18317..d1c6d70d8d 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -5083,6 +5083,7 @@ static void spapr_machine_2_11_class_options(MachineClass *mc) spapr_machine_2_12_class_options(mc); smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_ON; compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len); + mc->deprecation_reason = "old and not maintained - use a 2.12+ version"; } DEFINE_SPAPR_MACHINE(2_11, "2.11", false); diff --git a/roms/skiboot b/roms/skiboot index dbd5de6624..24a7eb3596 160000 --- a/roms/skiboot +++ b/roms/skiboot @@ -1 +1 @@ -Subproject commit dbd5de6624d7466bb67d1eb4e57bc3a8e2ad9e87 +Subproject commit 24a7eb35966d93455520bc2debdd7954314b638b -- cgit 1.4.1