From c02dc0ae52864ff2a3175c81eb3de6123c6a88af Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Fri, 9 Jan 2026 10:24:41 -0600 Subject: [PATCH] Switch test fixture metadata compression to gzip We don't actually care about what compression is used here, and in fact would prefer uncompressed metadata if it was supported. We do, however, need to use a compression algorithm which is supported on the version of createrepo_c that's distributed on our target Ubuntu platforms. Also clean up a GNUPG backup file that doesn't need to be committed. Signed-off-by: Scott K Logan --- ...57bfb03c38a47f60e7badde8a0c69-other.xml.gz | Bin 0 -> 125 bytes ...a8b7ddd50053b53f02b6bfe6380-primary.xml.gz | Bin 0 -> 133 bytes ...607ebc17319d7a8d143a8e066e-primary.xml.zst | Bin 123 -> 0 bytes ...1191dceb5c100bac2e66249d518d-other.xml.zst | Bin 117 -> 0 bytes ...1c53284aa96d36d15a11fb76b-filelists.xml.gz | Bin 0 -> 125 bytes ...fbaca48f629465be5f53f82b-filelists.xml.zst | Bin 118 -> 0 bytes .../fixtures/empty/x86_64/repodata/repomd.xml | 26 ++++++++-------- .../empty/x86_64/repodata/repomd.xml.asc | 10 +++---- test/fixtures/gnupg_home/pubring.kbx~ | Bin 32 -> 0 bytes ...25aaa50a3ea6cf0429393924-filelists.xml.zst | Bin 312 -> 0 bytes ...1b63cbb29dc5a8c2918e3287826dd-other.xml.gz | Bin 0 -> 366 bytes ...5911f1005fc85ac66be53caa305-primary.xml.gz | Bin 0 -> 743 bytes ...29454ddc679fbe0c361fbe99a8-primary.xml.zst | Bin 762 -> 0 bytes ...eb72330cf6c70fc1e2dc33aa3-filelists.xml.gz | Bin 0 -> 308 bytes ...87760e44b04f44545fcc8f077efe-other.xml.zst | Bin 369 -> 0 bytes .../populated/x86_64/repodata/repomd.xml | 28 +++++++++--------- .../populated/x86_64/repodata/repomd.xml.asc | 10 +++---- 17 files changed, 37 insertions(+), 37 deletions(-) create mode 100644 test/fixtures/empty/x86_64/repodata/3bd9d0cd9440ff15d2b04538e38c790c61a57bfb03c38a47f60e7badde8a0c69-other.xml.gz create mode 100644 test/fixtures/empty/x86_64/repodata/644a71fb6a04ccc7bbc6a09cd3caec8fa722ba8b7ddd50053b53f02b6bfe6380-primary.xml.gz delete mode 100644 test/fixtures/empty/x86_64/repodata/69a3730a283b85a4b3cff7d04bfde3b2b234f0607ebc17319d7a8d143a8e066e-primary.xml.zst delete mode 100644 test/fixtures/empty/x86_64/repodata/6b37cc67608a24beaa81e1191d218f2ffd6b1191dceb5c100bac2e66249d518d-other.xml.zst create mode 100644 test/fixtures/empty/x86_64/repodata/6f79d93f0d431f5c387637c89a72f250eab07b01c53284aa96d36d15a11fb76b-filelists.xml.gz delete mode 100644 test/fixtures/empty/x86_64/repodata/9b07d97dc6ececed89aac0650b67bfb292647fe9fbaca48f629465be5f53f82b-filelists.xml.zst delete mode 100644 test/fixtures/gnupg_home/pubring.kbx~ delete mode 100644 test/fixtures/populated/x86_64/repodata/1bc61b00a57884c5fa84243641f9fca44442b11c25aaa50a3ea6cf0429393924-filelists.xml.zst create mode 100644 test/fixtures/populated/x86_64/repodata/29a9fe6f4c2edf89af438922e03306b7a391b63cbb29dc5a8c2918e3287826dd-other.xml.gz create mode 100644 test/fixtures/populated/x86_64/repodata/4cf25fc8340b1857d3b2f970738d4757727375911f1005fc85ac66be53caa305-primary.xml.gz delete mode 100644 test/fixtures/populated/x86_64/repodata/7b0088499bc239d4c9b70c8d36ff5880ef60fa29454ddc679fbe0c361fbe99a8-primary.xml.zst create mode 100644 test/fixtures/populated/x86_64/repodata/ad48ffef4111ef594e37c66d12ba535ff6ed8b5eb72330cf6c70fc1e2dc33aa3-filelists.xml.gz delete mode 100644 test/fixtures/populated/x86_64/repodata/f6add9f96a31ea9ee3c37a950d1033e4044e87760e44b04f44545fcc8f077efe-other.xml.zst diff --git a/test/fixtures/empty/x86_64/repodata/3bd9d0cd9440ff15d2b04538e38c790c61a57bfb03c38a47f60e7badde8a0c69-other.xml.gz b/test/fixtures/empty/x86_64/repodata/3bd9d0cd9440ff15d2b04538e38c790c61a57bfb03c38a47f60e7badde8a0c69-other.xml.gz new file mode 100644 index 0000000000000000000000000000000000000000..5acee025dfbeabb79be0b94190d99a9324f6f07b GIT binary patch literal 125 zcmb2|=3oE=X4^A{e1{cy7!KI3cevMmdF`r(oLa}<4B8Q#Tr)Hrj(%QT@}kbl_^Zg( z>HR{RB6hqM6gfSocEZs^&;RbSO(<$US^D&FucbHur0x$@xm4tpL`BI5PkM literal 0 HcmV?d00001 diff --git a/test/fixtures/empty/x86_64/repodata/644a71fb6a04ccc7bbc6a09cd3caec8fa722ba8b7ddd50053b53f02b6bfe6380-primary.xml.gz b/test/fixtures/empty/x86_64/repodata/644a71fb6a04ccc7bbc6a09cd3caec8fa722ba8b7ddd50053b53f02b6bfe6380-primary.xml.gz new file mode 100644 index 0000000000000000000000000000000000000000..0e97c521536d1bfe01f9bc3bc33802a914516758 GIT binary patch literal 133 zcmb2|=3oE==GN1We1{YS94^-SJErMhnVZ@0&c@M}q0v({l`ZH%L5;ZE_I3Y%SIJH} z!hK%KSbE1PNtR9L6+h)Y*mzgpJmT#V&e`1SEDbdZO+VzU)$v+-qV~iE{wWf>erY{5 l4ov&;;;GJ;?-tyR8t3Hmj%OvXS-*_mnjd)myY_OR?EtOrIPU-e literal 0 HcmV?d00001 diff --git a/test/fixtures/empty/x86_64/repodata/69a3730a283b85a4b3cff7d04bfde3b2b234f0607ebc17319d7a8d143a8e066e-primary.xml.zst b/test/fixtures/empty/x86_64/repodata/69a3730a283b85a4b3cff7d04bfde3b2b234f0607ebc17319d7a8d143a8e066e-primary.xml.zst deleted file mode 100644 index ea97e2cc61c3a6eee091e502f6e24abd4327b3c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 123 zcmV->0EGW2wJ-euV3h*^f=3w|aJLQ+P{T+G)=_B+DggpI6AnvYSxEkW0}g9{+del+ z#L`05WMmVz(P&56Q5x#78#08H#)lK7okel?5HjMwLDlrvi`n0{&z*>Mr~oh^6jUMZ d8f4B!ixW`g&`rq)^LjZ_0}usukciny#2LF)Gx`7k diff --git a/test/fixtures/empty/x86_64/repodata/6b37cc67608a24beaa81e1191d218f2ffd6b1191dceb5c100bac2e66249d518d-other.xml.zst b/test/fixtures/empty/x86_64/repodata/6b37cc67608a24beaa81e1191d218f2ffd6b1191dceb5c100bac2e66249d518d-other.xml.zst deleted file mode 100644 index 8cb24b4cfe8d1a63774839f56826c5f68bc62c65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmV-*0E+)8wJ-euU}XaULdO^yaJLQ!%6QLS`#~NxF#y8e9myMzEF}NG0SAhoJNkOK zh)`N+l8$h4uwr!ix%u7gY(JjNKFfTp?GBXxrAfZ#7Q@dSeLX~kGE@K{6bzb>#~L2b XjTR@M=|Lu=A53$LfdT;l*c4P0?xZsC diff --git a/test/fixtures/empty/x86_64/repodata/6f79d93f0d431f5c387637c89a72f250eab07b01c53284aa96d36d15a11fb76b-filelists.xml.gz b/test/fixtures/empty/x86_64/repodata/6f79d93f0d431f5c387637c89a72f250eab07b01c53284aa96d36d15a11fb76b-filelists.xml.gz new file mode 100644 index 0000000000000000000000000000000000000000..06d73cd337ef6ce7f65c9571099509f8eddea51b GIT binary patch literal 125 zcmV-@0D}J?iwFP!0000014YU)4#OY}0Kh%3K;8@KR#iZ@zMy@872MPcI8iYX&(GG* zcYf+6n}fcUHwkdHBN&o-ODs!(*Yk0?!4wDo=1iHZR?|zC8sMY4-<``Wt=rUAvXq)D fq?l0A{XUo-=M@*K0Y->}|5H2xxnPOMeEw;_1!iw-;eJ}yb-?_Ir z(NwH7Qu!)uL0EHA*|Wxeox-+g7uZmQk6U%n{2x;JYZs5db8mB!igly_KqweeDUTb2 Yygg~4K&r>EBQ|l`#Ulj)0N5;46ne`v^Z)<= diff --git a/test/fixtures/empty/x86_64/repodata/repomd.xml b/test/fixtures/empty/x86_64/repodata/repomd.xml index 0c73fdd..917e04c 100644 --- a/test/fixtures/empty/x86_64/repodata/repomd.xml +++ b/test/fixtures/empty/x86_64/repodata/repomd.xml @@ -1,28 +1,28 @@ - 1741312127 + 1767975461 - 69a3730a283b85a4b3cff7d04bfde3b2b234f0607ebc17319d7a8d143a8e066e + 644a71fb6a04ccc7bbc6a09cd3caec8fa722ba8b7ddd50053b53f02b6bfe6380 e1e2ffd2fb1ee76f87b70750d00ca5677a252b397ab6c2389137a0c33e7b359f - - 1741312127 - 123 + + 1767975461 + 133 167 - 9b07d97dc6ececed89aac0650b67bfb292647fe9fbaca48f629465be5f53f82b + 6f79d93f0d431f5c387637c89a72f250eab07b01c53284aa96d36d15a11fb76b bf9808b81cb2dbc54b4b8e35adc584ddcaa73bd81f7088d73bf7dbbada961310 - - 1741312127 - 118 + + 1767975461 + 125 125 - 6b37cc67608a24beaa81e1191d218f2ffd6b1191dceb5c100bac2e66249d518d + 3bd9d0cd9440ff15d2b04538e38c790c61a57bfb03c38a47f60e7badde8a0c69 e0ed5e0054194df036cf09c1a911e15bf2a4e7f26f2a788b6f47d53e80717ccc - - 1741312127 - 117 + + 1767975461 + 125 121 diff --git a/test/fixtures/empty/x86_64/repodata/repomd.xml.asc b/test/fixtures/empty/x86_64/repodata/repomd.xml.asc index e3af153..2fd8140 100644 --- a/test/fixtures/empty/x86_64/repodata/repomd.xml.asc +++ b/test/fixtures/empty/x86_64/repodata/repomd.xml.asc @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNATURE----- -iLMEAAEIAB0WIQTIDIGguJ8DD/0/ZPqG4a6d89vbtQUCZ8pQigAKCRCG4a6d89vb -tSLUA/0WEcuQjZUWJYorfos2iZwNwkvJHGKeMWdR+iTf8UPG9w74eEEblAl9gS0E -AtEFzyfgoKfORuAabhqJfn3qiaPdslwzOxp4p35M/Vkrwzadvo7u02AUf5xKZl3c -mUbcKgdz85sOp2Agy9bmeIWzdQveiaGmBnpKj0/hN9xfzGKDKw== -=yloC +iLMEAAEKAB0WIQTIDIGguJ8DD/0/ZPqG4a6d89vbtQUCaWEqYwAKCRCG4a6d89vb +tcQKA/98gPHYcFvs4QkglW0Kw5aoI4SouH6zk4KAObDfRCjLukaVBJYusnwBaQYc +JkinmyT6AZfjNIwXX/bpPLyIPTgD5ER6s3dmVfvk5/+pfqsV+6UXyTn/S0bfIVml +UA9DOi4AmLRvQ3hL+aH1XBByg8upPCTzftEwjPTUr8txUurHqg== +=C7DM -----END PGP SIGNATURE----- diff --git a/test/fixtures/gnupg_home/pubring.kbx~ b/test/fixtures/gnupg_home/pubring.kbx~ deleted file mode 100644 index d3c124e400acef2c219cbef488677818bca91884..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 ecmZQzU{GLWWMJ}kib!Jsg7njVeIN{Cg8%?ja|Mh5 diff --git a/test/fixtures/populated/x86_64/repodata/1bc61b00a57884c5fa84243641f9fca44442b11c25aaa50a3ea6cf0429393924-filelists.xml.zst b/test/fixtures/populated/x86_64/repodata/1bc61b00a57884c5fa84243641f9fca44442b11c25aaa50a3ea6cf0429393924-filelists.xml.zst deleted file mode 100644 index 2814980a81da589c8383c62f8911ca80c3da9dea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 312 zcmV-80muF*wJ-euV0{SyMpQr|KxfJWgMnGFcqLFvdPx97T9SdX{-N?)c5NH~#Bg~~ z;{rDTHvlvMKe5Umc}3+2qpFiK20-O3^~04;jD<6v^y!q&@gTY(3>X~ri|TY6>#uHz z>sRf>_ZN#!41^PZXiMRl)|%231u~3V8rK|376W8(Xju~Jj7z2o)!|bYv?|E0z02VoskhXvX?!-$ Kl<5FAH5COo|BxpD diff --git a/test/fixtures/populated/x86_64/repodata/29a9fe6f4c2edf89af438922e03306b7a391b63cbb29dc5a8c2918e3287826dd-other.xml.gz b/test/fixtures/populated/x86_64/repodata/29a9fe6f4c2edf89af438922e03306b7a391b63cbb29dc5a8c2918e3287826dd-other.xml.gz new file mode 100644 index 0000000000000000000000000000000000000000..dc5a37e5400ccde9b676eddba2d07a9094035773 GIT binary patch literal 366 zcmV-!0g?V6iwFP!0000019g$XZrd;nhVOX_jstqLEya%PY_^MD3Jlw6?H+)!Xj_OZ z8L|?1Z$CK8iuKSFN$>|h{$%~QP8O~l7UNxmG8G8yIdd0zDU zve%{VbEQuDa5|{`q=l@MEK4d1Q3xSQ-Yaor?)OyjF+XWt6|zTgG;xE$FNx-B61}$z z0)=jD(D^N5y9222{(xt{wFGXCZ*EhG5ZG=x+aqQ-c{h?9*!ltJ5=S2ze2IKz_X&Q| z;3zzNUZ2(1GbFH05Q#+46uCjE)S(dhUI=Ux_~uMBWd9ujy1*2TcWIry5kBH|K1TQs zKm0)M&XNCdN|{$>uKseKw1)Y29KFkv&fCtrWHPI95Iwv*4O}T0a`7F%&hGnd>D!yz MKPnJ4FBt*=0EpGB?f?J) literal 0 HcmV?d00001 diff --git a/test/fixtures/populated/x86_64/repodata/4cf25fc8340b1857d3b2f970738d4757727375911f1005fc85ac66be53caa305-primary.xml.gz b/test/fixtures/populated/x86_64/repodata/4cf25fc8340b1857d3b2f970738d4757727375911f1005fc85ac66be53caa305-primary.xml.gz new file mode 100644 index 0000000000000000000000000000000000000000..2e9e984a4274c8b522fee19725dd8649965e827b GIT binary patch literal 743 zcmVr zZA-#+f|f=^_drNvxq%LyPb8d^;GFgiTYT}5qZm8u;?l5X6TO>20+SPCOEVfJFLKkI z5(FJ>&_~J^xEMh^``K)n{m6^`fs*NYP_m_ee|e&vsLO1(EBm7AWhMLF;c$}s)BdnK z$tn9MZS0Gp1>b}F4ij2;OE^5)yT7mb2 zJJ`D!1>j`5|Ci@cL~Sd{J>X6<0+)aZaytO=fn#WCxzEb@E6A2syJCAI8-7A}RucT` z+MHkmUP*kCEq!wrN_x!)-_kFC(ht5xLe|T^O|+yz_-9u5PVVU%MrU`)Njqn5bnoDV z)56(g{k#&m1hDbf@E;E~>Z0ri;OM-B=>x#C@Ue35AY*}-aY(>>utD+n&_4zUZwvdn ZiVeGs`^%e;=IxX2{sUs_zs@cO005ShcFzC+ literal 0 HcmV?d00001 diff --git a/test/fixtures/populated/x86_64/repodata/7b0088499bc239d4c9b70c8d36ff5880ef60fa29454ddc679fbe0c361fbe99a8-primary.xml.zst b/test/fixtures/populated/x86_64/repodata/7b0088499bc239d4c9b70c8d36ff5880ef60fa29454ddc679fbe0c361fbe99a8-primary.xml.zst deleted file mode 100644 index 48b4dcc47ab746e156c597cb1aae36cc76a6eb95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 762 zcmV5QWw>EFs>-Y2aZ1x>G7Z`Q3WHobS1w&}fN-O6HD){2*j z!{yd*J{@JkImg4|NzW=d0zg04#r;yK%D+Mo6T6s>dCw^oMEI7EibM5a-$1z<6r z6m+Sa6Ya2r4*O(E3s8`yfT2M_5{a7~aQ4p>1zE4`ti2xR@EY`kTS&YHdC+vj- zg_dai3|r>NZ*B@H-8*%uufr@KjXk|MNi?P|zH?}_Mr`B1>yULTi!B@|^w+4btd*hP zZIwRpfkyFe&U_b(90mkJ$s*zq_eAcI#_{;0X&OeuV7SM_aX_2~N*0cWqyZ%k$0C9c z7(Jedu~;+=$ZKkW;6Xt!N)Wb{qw%=u&i2xVW^;XMvGx^GpDflePa7-+V(>cJpgA?K8}>tX~KUiu|XhHDdRwd>Rc$K|YDod)LbGKokUBN{26vt(qqCP>@%| z`)Hg7lrc+MHO}LJL>A7&QIN|Rwa&sg4eG}{O)~9hI&P!{&)bWHb3$0Jqx74gv zN|pt!6Q-~qbAepeM)VI&#p&&@T6{Be|6olX5+b&V} z%R6*FEjH~l?{Ay-{e7-?F?{PJ-K(%J0XvpptpKt!Se#ck1k)#8HUH!`}1hX34PGca!3;f1g&&R+n&Sw+w;1DeY2`NZP4ft138bz z1`b1v(*vbO+xeWR`G^UsnT{BR5>e2*AIK!+QS=x%q|mJD+e)TmuN4Pb@ODjFq@4*bcGVhzfUEt5lVz9S|!<0 zUJe|rTP8FsLh2hM!O1Nr1`G9-I7xwcG>b;F1A4VD03==}NhR(s$FbI!SIZ40N z)mPkm>`yO!Jv=_W9FkFeOZ`%2v_u;){JZhz0F`dKc-;^2Gg{NzCl+~sSMveKorwPt G0ssKWx{f3O literal 0 HcmV?d00001 diff --git a/test/fixtures/populated/x86_64/repodata/f6add9f96a31ea9ee3c37a950d1033e4044e87760e44b04f44545fcc8f077efe-other.xml.zst b/test/fixtures/populated/x86_64/repodata/f6add9f96a31ea9ee3c37a950d1033e4044e87760e44b04f44545fcc8f077efe-other.xml.zst deleted file mode 100644 index fbc92a51bf4ca392cf4945293720c838fc4725aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmV-%0gnDCwJ-euU_}c6rddxTFl)8}0hA;`359dR6zSqv=Vnwo_uv%$G=_!M4YX z3iv?|8XWjdQ$`A>FSo?;n^a=ev#qR00TlcwSbG_(D19XJh+wqxbF1gFV;!XqrWePL!O4#4Jl=9>_1ssc|iY2#Th0{QNsE zJESEoaf@t&pgDL12-KcaFD$_H%%6c@rPMomCtCS5n}P~2Do-50%ImUAs%OiM9|h^< z3+*BzreJM415tm+>eN#OLPQGmvt{jUm;O%qkQOp2tSCg5NvVIhHb#SHah}CFZuUeK zHevrMRG?&1`Rx^M)$-*;SR~@s5=&zO4ge#|@W2j^$2txS19R8Nat;8>(CHv7GNc|D Px2EyfI8&wr*c4P0p@^qP diff --git a/test/fixtures/populated/x86_64/repodata/repomd.xml b/test/fixtures/populated/x86_64/repodata/repomd.xml index 4566743..b364257 100644 --- a/test/fixtures/populated/x86_64/repodata/repomd.xml +++ b/test/fixtures/populated/x86_64/repodata/repomd.xml @@ -1,28 +1,28 @@ - 1741306528 + 1767975735 - 7b0088499bc239d4c9b70c8d36ff5880ef60fa29454ddc679fbe0c361fbe99a8 - 811a43d7c75bf38cd332ad4c722ad4d69a37d13bd3fe715ba5ca8a099139a6ca - - 1741306528 - 762 + 4cf25fc8340b1857d3b2f970738d4757727375911f1005fc85ac66be53caa305 + 71f87b726a10aa4421797166c101d7de8aa1b8575faf046ce11107f7cee89adc + + 1767975735 + 743 1582 - 1bc61b00a57884c5fa84243641f9fca44442b11c25aaa50a3ea6cf0429393924 + ad48ffef4111ef594e37c66d12ba535ff6ed8b5eb72330cf6c70fc1e2dc33aa3 5d34b872402fad96f14f29fadf28de1b300b1192c30b32d7b5ef3ffd6566e879 - - 1741306528 - 312 + + 1767975735 + 308 529 - f6add9f96a31ea9ee3c37a950d1033e4044e87760e44b04f44545fcc8f077efe + 29a9fe6f4c2edf89af438922e03306b7a391b63cbb29dc5a8c2918e3287826dd f51a365f491209f945e1380caf716cff03e43c4794297fc348e53236fdf962b1 - - 1741306528 - 369 + + 1767975735 + 366 537 diff --git a/test/fixtures/populated/x86_64/repodata/repomd.xml.asc b/test/fixtures/populated/x86_64/repodata/repomd.xml.asc index c846e75..6d74065 100644 --- a/test/fixtures/populated/x86_64/repodata/repomd.xml.asc +++ b/test/fixtures/populated/x86_64/repodata/repomd.xml.asc @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNATURE----- -iLMEAAEIAB0WIQTIDIGguJ8DD/0/ZPqG4a6d89vbtQUCZ8o6ywAKCRCG4a6d89vb -tTlOA/99tUwiwgsHkMnKYJkDfwUBMHZNXfWncipTc0ahApkcV2sg1pbXtsNS7h+A -6bUzePCwVNrJQP56q/5W3ItMZscY9IoehFacLvNvIkfWDEDVxI6KnavPwQZJYdBP -vjb1oANvtuB3d93BWL6tCNwlGA4hNRo6JAI5Zz+HF7yLZ8Jajg== -=TniM +iLMEAAEKAB0WIQTIDIGguJ8DD/0/ZPqG4a6d89vbtQUCaWErPwAKCRCG4a6d89vb +tefkA/4mri55w0eVOWz4sQZk0Se7iZG10s3OSFkQwBz/fky7UccWor/d8sHFXuEm +rxUUDZBMl8mh81+3qphYcgE3vpg+yI0zDywWx9fQRLGLMYdVQK4OU3UCe+GKUpae +uWy6zhZ/5rHXcJ5kfuVACr/gn0OgebuGykDqodRB7Ie5WPczUA== +=1iPR -----END PGP SIGNATURE-----