Only run on Juju 2

Author: dragomirp

spread.yaml

@@ -80,6 +80,9 @@ backends:
 
       echo "runner:$SPREAD_PASSWORD" | sudo chpasswd
 
+      # Remove the preinstalled lxd
+      sudo snap remove --purge --terminate lxd
+
       ADDRESS localhost
 
     # HACK: spread does not pass environment variables set on runner

src/utils.py

@@ -68,7 +68,8 @@ def _remove_stale_otel_sdk_packages():
     """
     # all imports are local to keep this function standalone, side-effect-free, and easy to revert later
 
-    if os.getenv("JUJU_DISPATCH_PATH") != "hooks/upgrade-charm":
+    major_version = int(juju_ver.split(".")[0]) if (juju_ver := os.getenv("JUJU_VERSION")) else 3
+    if os.getenv("JUJU_DISPATCH_PATH") != "hooks/upgrade-charm" or major_version > 2:
         return
 
     otel_logger = logging.getLogger("charm_tracing_otel_patcher")

tests/unit/test_utils.py

@@ -59,8 +59,17 @@ def test_remove_stale_otel_sdk_packages():
         _distributions.reset_mock()
         _shutil.rmtree.reset_mock()
 
+        # don't execute on Juju 3
+        _getenv.side_effect = ["3.0.0", "hooks/upgrade-charm"]
+        _remove_stale_otel_sdk_packages()
+
+        _distributions.assert_not_called()
+        _shutil.rmtree.assert_not_called()
+        _distributions.reset_mock()
+        _shutil.rmtree.reset_mock()
+
         # Upgrade hook, nothing to remove
-        _getenv.return_value = "hooks/upgrade-charm"
+        _getenv.side_effect = ["2.9.53", "hooks/upgrade-charm"]
         _distributions.return_value = [other_dist, otel_dist]
 
         _remove_stale_otel_sdk_packages()
@@ -71,6 +80,7 @@ def test_remove_stale_otel_sdk_packages():
         _shutil.rmtree.reset_mock()
 
         # Upgrade hook, duplicate otel packages
+        _getenv.side_effect = ["2.9.53", "hooks/upgrade-charm"]
         _distributions.return_value = [other_dist, otel_dist, stale_otel_dist]
         _remove_stale_otel_sdk_packages()