diff mbox series

[v2,for,3.0,13/16] docker: add --hint to docker.py check

Message ID 20180713121741.19262-14-alex.bennee@linaro.org
State Superseded
Headers show
Series various docker fixes | expand

Commit Message

Alex Bennée July 13, 2018, 12:17 p.m. UTC
When a check fails we currently just report why we failed. This is not
totally helpful to people who want to boot-strap a new image. Add a
--hint option which we can pass down to give a bit more information.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
 tests/docker/Makefile.include | 3 ++-
 tests/docker/docker.py        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

-- 
2.17.1

Comments

Philippe Mathieu-Daudé July 17, 2018, 3:24 a.m. UTC | #1
On 07/13/2018 09:17 AM, Alex Bennée wrote:
> When a check fails we currently just report why we failed. This is not

> totally helpful to people who want to boot-strap a new image. Add a

> --hint option which we can pass down to give a bit more information.

> 

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>


Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


> ---

>  tests/docker/Makefile.include | 3 ++-

>  tests/docker/docker.py        | 3 ++-

>  2 files changed, 4 insertions(+), 2 deletions(-)

> 

> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include

> index ec23620153..c9e412f9d0 100644

> --- a/tests/docker/Makefile.include

> +++ b/tests/docker/Makefile.include

> @@ -73,7 +73,8 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker

>  			$(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \

>  			"BUILD","binfmt debian-$* (debootstrapped)"),		\

>  		$(call quiet-command,						\

> -			$(DOCKER_SCRIPT) check --quiet qemu:debian-$* $<,	\

> +			$(DOCKER_SCRIPT) check --quiet qemu:debian-$* $<	\

> +			--hint "you will need to build $(EXECUTABLE)",		\

>  			"CHECK", "debian-$* exists"))

>  

>  endif

> diff --git a/tests/docker/docker.py b/tests/docker/docker.py

> index 2f81c6b13b..523f4b95a2 100755

> --- a/tests/docker/docker.py

> +++ b/tests/docker/docker.py

> @@ -475,6 +475,7 @@ class CheckCommand(SubCommand):

>                              default="checksum", help="check type")

>          parser.add_argument("--olderthan", default=60, type=int,

>                              help="number of minutes")

> +        parser.add_argument("--hint", default="", help="hint to user")

>  

>      def run(self, args, argv):

>          tag = args.tag

> @@ -487,7 +488,7 @@ class CheckCommand(SubCommand):

>  

>          info = dkr.inspect_tag(tag)

>          if info is None:

> -            print("Image does not exist")

> +            print("Image does not exist %s" % (args.hint))

>              return 1

>  

>          if args.checktype == "checksum":

>
Philippe Mathieu-Daudé July 17, 2018, 3:14 p.m. UTC | #2
On 07/17/2018 12:24 AM, Philippe Mathieu-Daudé wrote:
> On 07/13/2018 09:17 AM, Alex Bennée wrote:

>> When a check fails we currently just report why we failed. This is not

>> totally helpful to people who want to boot-strap a new image. Add a

>> --hint option which we can pass down to give a bit more information.

>>

>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> 

> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff mbox series

Patch

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index ec23620153..c9e412f9d0 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -73,7 +73,8 @@  docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
 			$(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \
 			"BUILD","binfmt debian-$* (debootstrapped)"),		\
 		$(call quiet-command,						\
-			$(DOCKER_SCRIPT) check --quiet qemu:debian-$* $<,	\
+			$(DOCKER_SCRIPT) check --quiet qemu:debian-$* $<	\
+			--hint "you will need to build $(EXECUTABLE)",		\
 			"CHECK", "debian-$* exists"))
 
 endif
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 2f81c6b13b..523f4b95a2 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -475,6 +475,7 @@  class CheckCommand(SubCommand):
                             default="checksum", help="check type")
         parser.add_argument("--olderthan", default=60, type=int,
                             help="number of minutes")
+        parser.add_argument("--hint", default="", help="hint to user")
 
     def run(self, args, argv):
         tag = args.tag
@@ -487,7 +488,7 @@  class CheckCommand(SubCommand):
 
         info = dkr.inspect_tag(tag)
         if info is None:
-            print("Image does not exist")
+            print("Image does not exist %s" % (args.hint))
             return 1
 
         if args.checktype == "checksum":