From 7b453a493cc24188aea2591c70317b13f4b434b9 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 2 Jan 2024 14:06:35 -0800 Subject: [PATCH] autocloud: blocking off more atomic tests on non-atomic images Signed-off-by: Adam Williamson --- tests/autocloud.pm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/autocloud.pm b/tests/autocloud.pm index 37bb7a88..847a6b9c 100644 --- a/tests/autocloud.pm +++ b/tests/autocloud.pm @@ -66,14 +66,16 @@ sub run { send_key "alt-f2"; console_login(user => "test", password => "weakpassword"); assert_script_run "sudo python3 -m unittest tunirtests.cloudservice.TestServiceAfter -v"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestDockerInstalled -v"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestDockerStorageSetup -v"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestAtomicFirstBootRun -v"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestAtomicCommand -v"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestAtomicDockerImage -v"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestRootMount -v"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.Testreadonlymount -v"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestDockerDaemon -v"; + if (get_var("CANNED")) { + assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestDockerInstalled -v"; + assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestDockerStorageSetup -v"; + assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestAtomicFirstBootRun -v"; + assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestAtomicCommand -v"; + assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestAtomicDockerImage -v"; + assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestRootMount -v"; + assert_script_run "sudo python3 -m unittest tunirtests.atomictests.Testreadonlymount -v"; + assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestDockerDaemon -v"; + } }