particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

image-info: do not include inputhash in the report

Browse source 
The algorithm from calculating changed in osbuild 24, thus breaking the
testsuite. As the the inputhash is merely a implementation detail, there's
no need to test it in the image tests. Nevertheless, the inputhash is also
tested in the osbuild's testsuite.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2021-02-03 16:10:54 +01:00 • committed by Ondřej Budai
parent 2b41190cf3
commit 6456fbe6a5
5 changed files with 16 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/data/manifests/fedora_32-x86_64-fedora_iot_commit-boot.json
View file

@ -10213,11 +10213,9 @@
"VERSION_ID": "32"
},
"ostree": {
"refs": {
"fedora/32/x86_64/iot": {
"inputhash": "e7a265e665ce2765c90c1a51ba187202e8b77b4e0aadddfc545189171cb9c31f"
}
},
"refs": [
"fedora/32/x86_64/iot"
],
"repo": {
"core.mode": "archive-z2"
}

8
test/data/manifests/fedora_33-x86_64-fedora_iot_commit-boot.json
View file

@ -10659,11 +10659,9 @@
"VERSION_ID": "33"
},
"ostree": {
"refs": {
"fedora/33/x86_64/iot": {
"inputhash": "af23373725489f462ab563895f7ffff450504d0057b8e4569244e9884c3ceb71"
}
},
"refs": [
"fedora/33/x86_64/iot"
],
"repo": {
"core.mode": "archive-z2"
}

8
test/data/manifests/rhel_8-aarch64-rhel_edge_commit-boot.json
View file

@ -8276,11 +8276,9 @@
"VERSION_ID": "8.3"
},
"ostree": {
"refs": {
"rhel/8/aarch64/edge": {
"inputhash": "e58e63f14f7edbb5add61ef8f65bf84f5934cdb0e4119caeca5a5e04461f65d3"
}
},
"refs": [
"rhel/8/aarch64/edge"
],
"repo": {
"core.mode": "archive-z2"
}

8
test/data/manifests/rhel_8-x86_64-rhel_edge_commit-boot.json
View file

@ -8561,11 +8561,9 @@
"VERSION_ID": "8.3"
},
"ostree": {
"refs": {
"rhel/8/x86_64/edge": {
"inputhash": "e255d15d889add2e2a1e8dc4fad9d73b61d5e2f2608f0713cf7f99a229cdaa49"
}
},
"refs": [
"rhel/8/x86_64/edge"
],
"repo": {
"core.mode": "archive-z2"
}

3
tools/image-info
View file

@ -499,9 +499,6 @@ def append_ostree_repo(report, repo):
resolved = {r: ostree("rev-parse", r).stdout.strip() for r in refs}
commit = resolved[refs[0]]
refs = {r: {"inputhash": ostree("show", "--print-metadata-key=rpmostree.inputhash", resolved[r]).stdout.strip("'\n")} for r in refs}
report["ostree"]["refs"] = refs
with tempfile.TemporaryDirectory(dir="/var/tmp") as tmpdir:
tree = os.path.join(tmpdir, "tree")
ostree("checkout", "--force-copy", commit, tree)