| Message ID | 20180618130709.19730-7-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Docker tweaks for TCG testing | expand |
On 06/18/2018 10:07 AM, Alex Bennée wrote: > This just gets confusing especially as the helper function doesn't > even take into account any extra files (or the executable). Currently > the actual check just ignores them and also passes the result through > _dockerfile_preprocess so we fix that too. Looks correct. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > tests/docker/docker.py | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/tests/docker/docker.py b/tests/docker/docker.py > index 3072bf4a31..325915a6f9 100755 > --- a/tests/docker/docker.py > +++ b/tests/docker/docker.py > @@ -201,8 +201,10 @@ class Docker(object): > > tmp_df.write("\n") > tmp_df.write("LABEL com.qemu.dockerfile-checksum=%s" % > - _text_checksum("\n".join([dockerfile] + > - extra_files_cksum))) > + _text_checksum(_dockerfile_preprocess(dockerfile))) > + for f, c in extra_files_cksum: > + tmp_df.write("LABEL com.qemu.%s-checksum=%s" % (f, c)) > + > tmp_df.flush() > > self._do_check(["build", "-t", tag, "-f", tmp_df.name] + argv + \ > @@ -317,7 +319,7 @@ class BuildCommand(SubCommand): > _copy_binary_with_libs(args.include_executable, docker_dir) > for filename in args.extra_files or []: > _copy_with_mkdir(filename, docker_dir) > - cksum += [_file_checksum(filename)] > + cksum += [(filename, _file_checksum(filename))] > > argv += ["--build-arg=" + k.lower() + "=" + v > for k, v in os.environ.iteritems() >
diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 3072bf4a31..325915a6f9 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -201,8 +201,10 @@ class Docker(object): tmp_df.write("\n") tmp_df.write("LABEL com.qemu.dockerfile-checksum=%s" % - _text_checksum("\n".join([dockerfile] + - extra_files_cksum))) + _text_checksum(_dockerfile_preprocess(dockerfile))) + for f, c in extra_files_cksum: + tmp_df.write("LABEL com.qemu.%s-checksum=%s" % (f, c)) + tmp_df.flush() self._do_check(["build", "-t", tag, "-f", tmp_df.name] + argv + \ @@ -317,7 +319,7 @@ class BuildCommand(SubCommand): _copy_binary_with_libs(args.include_executable, docker_dir) for filename in args.extra_files or []: _copy_with_mkdir(filename, docker_dir) - cksum += [_file_checksum(filename)] + cksum += [(filename, _file_checksum(filename))] argv += ["--build-arg=" + k.lower() + "=" + v for k, v in os.environ.iteritems()
This just gets confusing especially as the helper function doesn't even take into account any extra files (or the executable). Currently the actual check just ignores them and also passes the result through _dockerfile_preprocess so we fix that too. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/docker/docker.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)