Running the docker build in meson spams the output so default to quiet and make --verbose the options. If we want to expose verbosity in meson we can deal with that later.
Signed-off-by: Alex Bennée <[email protected]> --- tests/docker/Makefile.include | 10 +++++----- tests/docker/docker.py | 22 ++++++++++++---------- tests/lcitool/libvirt-ci | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 74bf471f171..85825d74dfb 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -72,13 +72,13 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker DEB_TYPE=$(DEB_TYPE) \ $(if $(DEB_URL),DEB_URL=$(DEB_URL),) \ $(DOCKER_SCRIPT) build -t qemu/debian-$* -f $< \ - $(if $(DOCKER_V),,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(DOCKER_V),--verbose) $(if $(NOCACHE),--no-cache) \ $(if $(NOUSER),,--add-current-user) \ $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES)) \ $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \ "BUILD","binfmt debian-$* (debootstrapped)"), \ $(call quiet-command, \ - $(DOCKER_SCRIPT) check --quiet qemu/debian-$* $< || \ + $(DOCKER_SCRIPT) check qemu/debian-$* $< || \ { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) @@ -103,17 +103,17 @@ debian-toolchain-run = \ $(if $(NOCACHE)$(NOFETCH), \ $(call quiet-command, \ $(DOCKER_SCRIPT) build -t qemu/$1 -f $< \ - $(if $(DOCKER_V),,--quiet) \ + $(if $(DOCKER_V),--verbose) \ $(if $(NOCACHE),--no-cache) \ --registry $(DOCKER_REGISTRY) --extra-files \ $(DOCKER_FILES_DIR)/$1.d/build-toolchain.sh, \ "BUILD", $1), \ $(call quiet-command, \ - $(DOCKER_SCRIPT) fetch $(if $(DOCKER_V),,--quiet) \ + $(DOCKER_SCRIPT) fetch $(if $(DOCKER_V),--verbose) \ qemu/$1 $(DOCKER_REGISTRY), \ "FETCH", $1) \ $(call quiet-command, \ - $(DOCKER_SCRIPT) update $(if $(DOCKER_V),,--quiet) \ + $(DOCKER_SCRIPT) update $(if $(DOCKER_V),--verbose) \ qemu/$1 \ $(if $(NOUSER),,--add-current-user) \ "PREPARE", $1)) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index d7eb4cf6811..10cb4cbde11 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -312,8 +312,8 @@ class SubCommand(object): name = None # Subcommand name def shared_args(self, parser): - parser.add_argument("--quiet", action="store_true", - help="Run quietly unless an error occurred") + parser.add_argument("--verbose", "-v", action="store_true", + help="Run verbosely (default is quiet)") def args(self, parser): """Setup argument parser""" @@ -341,7 +341,8 @@ def args(self, parser): -- to avoid confusion about its flags""") def run(self, args, argv): - return Docker(args.command).run(args.cmd, args.keep, quiet=args.quiet, + return Docker(args.command).run(args.cmd, args.keep, + quiet=not args.verbose, as_user=args.run_as_current_user) @@ -390,7 +391,7 @@ def run(self, args, argv): # Is there a .pre file to run in the build context? docker_pre = os.path.splitext(args.dockerfile)[0]+".pre" if os.path.exists(docker_pre): - stdout = DEVNULL if args.quiet else None + stdout = None if args.verbose else DEVNULL rc = subprocess.call(os.path.realpath(docker_pre), cwd=docker_dir, stdout=stdout) if rc == 3: @@ -416,7 +417,7 @@ def run(self, args, argv): for k, v in os.environ.items() if k.lower() in FILTERED_ENV_NAMES] dkr.build_image(tag, docker_dir, args.dockerfile, - quiet=args.quiet, user=args.user, + quiet=not args.verbose, user=args.user, argv=argv, registry=args.registry) rmtree(docker_dir) @@ -435,9 +436,9 @@ def args(self, parser): def run(self, args, argv): dkr = Docker(args.command) - dkr.command(cmd="pull", quiet=args.quiet, + dkr.command(cmd="pull", quiet=not args.verbose, argv=["%s/%s" % (args.registry, args.tag)]) - dkr.command(cmd="tag", quiet=args.quiet, + dkr.command(cmd="tag", quiet=not args.verbose, argv=["%s/%s" % (args.registry, args.tag), args.tag]) @@ -513,7 +514,7 @@ def run(self, args, argv): # Run the build with our tarball context dkr = Docker(args.command) - dkr.update_image(args.tag, tmp, quiet=args.quiet) + dkr.update_image(args.tag, tmp, quiet=not args.verbose) return 0 @@ -532,7 +533,8 @@ class ImagesCommand(SubCommand): name = "images" def run(self, args, argv): - return Docker(args.command).command("images", argv, args.quiet) + return Docker(args.command).command("images", argv, + quiet=not args.verbose) class ProbeCommand(SubCommand): @@ -574,7 +576,7 @@ def run(self, args, argv): cmd += ["-v", "%s:%s:ro,z" % (p, p)] cmd += [args.image, args.cc] cmd += argv - return Docker(args.command).run(cmd, False, quiet=args.quiet, + return Docker(args.command).run(cmd, False, quiet=not args.verbose, as_user=True) diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 76b5dd5b5c8..5176e136ab1 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 76b5dd5b5c84511e2e799c2b3d6a2a9b9f6a081d +Subproject commit 5176e136ab11e275eb9f57c3d5c80e77af6507cb -- 2.47.3
