test: make verify_clean_boot respect return code by series

tests/integration_tests/util.py

@@ -15,6 +15,7 @@
 
 from cloudinit.subp import subp
 from tests.integration_tests.integration_settings import PLATFORM
+from tests.integration_tests.releases import CURRENT_RELEASE, NOBLE
 
 LOG = logging.getLogger("integration_testing.util")
 
@@ -347,13 +348,16 @@ def _verify_clean_boot(
         out = instance.execute("cloud-init status --long")
         assert 1 != out.return_code, (
             f"Unexpected return code from `cloud-init status`. Expected rc=0 "
-            f"or rc=2, received rc={out.return_code}\nstdout: "
-            f"{out.stdout}\nstderr: {out.stderr}"
+            f"or rc=2, received rc={out.return_code}\nstdout:\n"
+            f"{out.stdout}\nstderr:\n{out.stderr}"
         )
     else:
         # we know that we should have a return code of 2
         out = instance.execute("cloud-init status --long")
-        assert 2 == out.return_code, (
+        rc = 2
+        if CURRENT_RELEASE < NOBLE:
+            rc = 0
+        assert rc == out.return_code, (
             f"Unexpected return code from `cloud-init status`. "
             f"Expected rc=2, received rc={out.return_code}\nstdout: "
             f"{out.stdout}\nstderr: {out.stderr}"