cli: make the branch parameter non-optional

Now it's a positional argument.

This needed a change in how the run subparser works: it needs to be set
up last, and its nargs had to be changed to '*' to make it work in some
occasions, like:
```
xcp-ng-dev container run 8.3 --help
```

Now it also allows to separate arguments using `--`:
```
xcp-ng-dev container run 8.3 -- bash --help
```

This was suggested by Yann Dirson

Suggested-by: Yann Dirson <yann.dirson@vates.tech>
Signed-off-by: Pau Ruiz Safont <pau.safont@vates.tech>

Author: psafont

src/xcp_ng_dev/cli.py

@@ -18,7 +18,6 @@
 
 CONTAINER_PREFIX = "ghcr.io/xcp-ng/xcp-ng-build-env"
 
-DEFAULT_BRANCH = '8.3'
 DEFAULT_ULIMIT_NOFILE = 2048
 RPMBUILD_STAGES = "abpfcilsrd"  # valid X values in `rpmbuild -bX`
 
@@ -40,9 +39,8 @@ def is_podman(runner):
     return False
 
 def add_common_args(parser):
-    parser.add_argument('-b', '--branch',
-                        help='XCP-ng version: 7.6, %s, etc. If not set, '
-                             'will default to %s.' % (DEFAULT_BRANCH, DEFAULT_BRANCH))
+    parser.add_argument('branch',
+                        help='The version of XCP-ng to prepare for the build. For example, 8.3.')
     parser.add_argument('-n', '--no-exit', action='store_true',
                         help='After finishing the execution of the action, drop user into a shell')
     parser.add_argument('-d', '--dir', action='append',
@@ -125,11 +123,13 @@ def buildparser():
     parser_run = subparsers_container.add_parser(
         'run',
         help='Execute a command inside a container')
-    parser_run.add_argument(
-        'command', nargs=argparse.REMAINDER,
-        help='Command to run inside the prepared container')
     add_container_args(parser_run)
     add_common_args(parser_run)
+    parser_run.add_argument(
+        'command', nargs='*',
+        help='Command with arguments to run inside the container, '
+             'if the command has arguments that start with --, '
+             'separate the arguments for this tool and the command with " -- ".')
 
     # shell -- like run bash
     parser_shell = argparse.ArgumentParser()
@@ -143,7 +143,7 @@ def buildparser():
 
 def container(args):
     build = args.action == 'build'
-    branch = args.branch or DEFAULT_BRANCH
+    branch = args.branch
     docker_arch = args.platform or ("linux/amd64/v2" if branch == "9.0" else "linux/amd64")
 
     docker_args = [RUNNER, "run", "-i", "-t",

test/test.sh

@@ -14,10 +14,9 @@ for REPO in ${REPOS}; do
     REPO_PATH=/tmp/"$REPO"
     git clone --branch "$TARGET_XCP_NG_VERSION" https://github.com/xcp-ng-rpms/"$REPO" "$REPO_PATH"
 
-    xcp-ng-dev container build "$REPO_PATH" \
+    xcp-ng-dev container build "$REPO_PATH" "$TARGET_XCP_NG_VERSION" \
         --name "$CONTAINER_NAME" \
         --fail-on-error \
-        -b "$TARGET_XCP_NG_VERSION" \
         --rm
 
     rm -rf "$REPO_PATH"