commands: require charmcraft name for command (#1093)

Co-authored-by: Alex Lowe <[email protected]>

Author: Sergio Schvezov

charmcraft/commands/pack.py

@@ -21,7 +21,6 @@
 import pathlib
 import shutil
 import subprocess
-import sys
 import tempfile
 from typing import Any, Collection, Dict, List, Mapping
 
@@ -336,7 +335,7 @@ def _recursive_pack_bundle(
         charms: Mapping[str, pathlib.Path],
     ) -> List[pathlib.Path]:
         bundle_charms = bundle_config.get("applications", {})
-        command_args = _get_charm_pack_args([sys.argv[0], "pack", "--verbose"], parsed_args)
+        command_args = _get_charm_pack_args(["charmcraft", "pack", "--verbose"], parsed_args)
         charms = _subprocess_pack_charms(charms, command_args)
         for name, value in bundle_charms.items():
             if name in charms:

tests/spread/charms/bundle/task.yaml

@@ -1,5 +1,4 @@
 summary: Recursively pack a bundle with all charms on
-manual: true
 systems:
   - ubuntu-22.04-64
 kill-timeout: 30m
@@ -11,7 +10,10 @@ prepare: |
   git clone --depth=1 "${BUNDLE}" bundle
 
 restore: |
-  pushd bundle
+  pushd bundle/charms/jupyter-controller
+  charmcraft clean
+  popd
+  pushd bundle/charms/jupyter-ui
   charmcraft clean
   popd
 
@@ -30,4 +32,5 @@ execute: |
   grep "charm: ${PWD}" output_bundle.yaml | cut -d: -f2 | xargs file -E
 
   # Test deploying the bundle.
-  juju deploy --dry-run *.zip
+  # TODO: install juju on the runner and re-enable this.
+  # juju deploy --dry-run *.zip