fixup! test: make verify_clean_boot respect return code by series

tests/integration_tests/util.py

@@ -355,11 +355,14 @@ def _verify_clean_boot(
         # we know that we should have a return code of 2
         out = instance.execute("cloud-init status --long")
         rc = 2
-        if CURRENT_RELEASE < NOBLE:
+        if CURRENT_RELEASE < NOBLE and "main" != os.environ.get("GITHUB_BASE_REF"):
+            # Old releases return 0 for backwards compatibility
             rc = 0
         assert rc == out.return_code, (
+            # CI on main doen't patch out this behavior so despite running on
+            # old releases it behaves as tip of main does
             f"Unexpected return code from `cloud-init status`. "
-            f"Expected rc=2, received rc={out.return_code}\nstdout: "
+            f"Expected rc={rc}, received rc={out.return_code}\nstdout: "
             f"{out.stdout}\nstderr: {out.stderr}"
         )
     schema = instance.execute("cloud-init schema --system --annotate")

tox.ini

@@ -243,6 +243,7 @@ passenv =
     CLOUD_INIT_*
     SSH_AUTH_SOCK
     OS_*
+    GITHUB_*
 setenv =
     PYTEST_ADDOPTS="-m ci and not adhoc"