From 78275c8462a064f3d688cab379e4dea9f9020568 Mon Sep 17 00:00:00 2001 From: Marek Blaha Date: Wed, 9 Oct 2024 10:16:14 +0200 Subject: [PATCH 1/2] Update to Fedora 40 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fd5e65ea2..8de88ad11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # $ podman build --build-arg TYPE=distro -t ci-dnf-stack -f Dockerfile # $ podman run --net none -it ci-dnf-stack behave dnf -ARG BASE=fedora:39 +ARG BASE=fedora:40 FROM $BASE ENV LANG C.UTF-8 From e28d71fe7cf4345083aedb70689422b860360ef8 Mon Sep 17 00:00:00 2001 From: Marek Blaha Date: Wed, 9 Oct 2024 10:16:31 +0200 Subject: [PATCH 2/2] Adjust reposync-xattrs test to renamed attributes The xattrs used by librepo to store checksums has been changed to lower case (see https://github.com/rpm-software-management/librepo/pull/327). This adjusts tests depending on xattrs to pass with both variants. --- dnf-behave-tests/dnf/plugins-core/reposync-xattrs.feature | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dnf-behave-tests/dnf/plugins-core/reposync-xattrs.feature b/dnf-behave-tests/dnf/plugins-core/reposync-xattrs.feature index 9c09c2cc3..ed0948132 100644 --- a/dnf-behave-tests/dnf/plugins-core/reposync-xattrs.feature +++ b/dnf-behave-tests/dnf/plugins-core/reposync-xattrs.feature @@ -33,9 +33,9 @@ Given I copy repository "simple-base" for modification Then stdout matches line by line """ # file: synced/x86_64/labirinto-1\.0-1\.fc29\.x86_64\.rpm - user\.Librepo\.checksum\.mtime="[0-9]+" - user\.Librepo\.checksum\.sha256="[0-9a-f]{64}" - user\.Librepo\.checksum\.sha512="[0-9a-f]{128}" + user\.[lL]ibrepo\.checksum\.mtime="[0-9]+" + user\.[lL]ibrepo\.checksum\.sha256="[0-9a-f]{64}" + user\.[lL]ibrepo\.checksum\.sha512="[0-9a-f]{128}" """ @@ -45,5 +45,5 @@ Given I use repository "simple-base" as http When I execute dnf with args "reposync --repoid=simple-base --norepopath --download-path=/synced --remote-time" Then the exit code is 0 # the timestamp stored in user.Librepo.checksum.mtime xattr is the same as mtime of the file in nanoseconds - When I execute "[ `getfattr --absolute-names --only-values -n 'user.Librepo.checksum.mtime' /synced/x86_64/labirinto-1.0-1.fc29.x86_64.rpm` == `date +%s%N -r /synced/x86_64/labirinto-1.0-1.fc29.x86_64.rpm` ]" + When I execute "[ `getfattr --absolute-names --only-values -m 'user\.[lL]ibrepo\.checksum\.mtime' /synced/x86_64/labirinto-1.0-1.fc29.x86_64.rpm` == `date +%s%N -r /synced/x86_64/labirinto-1.0-1.fc29.x86_64.rpm` ]" Then the exit code is 0