chore(release): merge 3.3.2 to main (#2121)

This merges all the bugfixes from the 3.3 branch to main.

charmcraft/application/commands/init.py

@@ -83,15 +83,8 @@
     ├── tests
     │   ├── integration
     │   │   └── test_charm.py      - Integration tests
-    │   ├── spread
-    │   │   ├── lib
-    │   │   │   └── test-helpers.sh
-    │   │   └── general
-    │   │       └── integration
-    │   │           └── task.yaml  - Run integration tests in spread back-end
     │   └── unit
     │       └── test_charm.py      - Unit tests
-    ├── spread.yaml                - Spread testing configuration file
     └── tox.ini                    - Configuration for tox, the tool to run all tests
 
 You will need to edit at least charmcraft.yaml and README.md.

charmcraft/application/commands/store.py

@@ -1655,6 +1655,7 @@ def run(self, parsed_args):
         to_query = [{"lib_id": lib.lib_id, "api": lib.api} for lib in local_libs_data]
         libs_tips = store.get_libraries_tips(to_query)
         analysis = []
+        return_code = 0
         for lib_data in local_libs_data:
             emit.debug(f"Verifying local lib {lib_data}")
             tip = libs_tips.get((lib_data.lib_id, lib_data.api))
@@ -1668,6 +1669,7 @@ def run(self, parsed_args):
                 pass
             elif tip.patch > lib_data.patch:
                 # the store is more advanced than local
+                return_code = 1
                 error_message = (
                     f"Library {lib_data.full_name} is out-of-date locally, Charmhub has "
                     f"version {tip.api:d}.{tip.patch:d}, please "
@@ -1681,6 +1683,7 @@ def run(self, parsed_args):
                     )
                 else:
                     # but shouldn't as hash is different!
+                    return_code = 1
                     error_message = (
                         f"Library {lib_data.full_name} version {tip.api:d}.{tip.patch:d} "
                         "is the same than in Charmhub but content is different"
@@ -1689,12 +1692,14 @@ def run(self, parsed_args):
                 # local is correctly incremented
                 if tip.content_hash == lib_data.content_hash:
                     # but shouldn't as hash is the same!
+                    return_code = 1
                     error_message = (
                         f"Library {lib_data.full_name} LIBPATCH number was incorrectly "
                         "incremented, Charmhub has the "
                         f"same content in version {tip.api:d}.{tip.patch:d}."
                     )
             else:
+                return_code = 1
                 error_message = (
                     f"Library {lib_data.full_name} has a wrong LIBPATCH number, it's too high "
                     "and needs to be consecutive, Charmhub "
@@ -1703,7 +1708,6 @@ def run(self, parsed_args):
             analysis.append((lib_data, error_message))
 
         # work on the analysis result, showing messages to the user if not programmatic output
-        return_code = 0
         for lib_data, error_message in analysis:
             if error_message is None:
                 store.create_library_revision(
@@ -1720,7 +1724,6 @@ def run(self, parsed_args):
                 )
             else:
                 message = error_message
-                return_code = 1
             if not parsed_args.format:
                 emit.message(message)
 

charmcraft/application/commands/test.py

@@ -28,7 +28,8 @@
 _overview = """
 Run charm tests in different back-ends.
 
-This command will run charm test suites using the spread tool. For further
+This command will run charm test suites using the spread tool. The test
+command is EXPERIMENTAL and may be changed without prior notice. For further
 information, see the spread documentation: https://github.com/snapcore/spread
 """
 
@@ -37,7 +38,7 @@ class TestCommand(base.CharmcraftCommand):
     """Initialize a directory to be a charm project."""
 
     name = "test"
-    help_msg = "Execute charm test suites"
+    help_msg = "Execute charm test suites (EXPERIMENTAL)"
     overview = _overview
     common = True
 
@@ -97,6 +98,10 @@ def run(self, parsed_args: argparse.Namespace):
             else:
                 spread_tasks = ["multipass"]
 
+        emit.progress(
+            "WARNING: This is an EXPERIMENTAL command that can be changed without prior notice.",
+            permanent=True,
+        )
         try:
             with emit.pause():
                 subprocess.run([*cmd, *spread_tasks], check=True)