Skip to content
This repository was archived by the owner on Apr 28, 2026. It is now read-only.

Commit 0deaaf6

Browse files
committed
nix: use previous version of libvirt in version migration tests
Since `libvirt` and `cloud-hypervisor` are shipped as pairs, the cross-version migration test should also use the appropriate `lbivirt` version. On-behalf-of: SAP [email protected] Signed-off-by: Julian Schindel <[email protected]>
1 parent 3ddcb98 commit 0deaaf6

3 files changed

Lines changed: 246 additions & 16 deletions

File tree

flake.lock

Lines changed: 231 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
cloud-hypervisor-prev.url = "github:cyberus-technology/cloud-hypervisor?ref=gardenlinux-release-26-03-26";
2424
cloud-hypervisor-prev.inputs.nixpkgs.follows = "nixpkgs";
2525

26+
# Previous release of libvirt to match cloud-hypervisor's previous version.
27+
libvirt-prev.url = "git+https://github.com/cyberus-technology/libvirt?ref=refs/tags/gardenlinux-release-26-03-31&submodules=1";
28+
libvirt-prev.inputs.cloud-hypervisor.follows = "cloud-hypervisor-prev";
29+
# Break the chain of cyclic dependencies:
30+
libvirt-prev.inputs.libvirt-tests.inputs.libvirt.follows = "libvirt-prev";
31+
libvirt-prev.inputs.nixpkgs.follows = "nixpkgs";
32+
2633
edk2-src.url = "git+https://github.com/cyberus-technology/edk2?ref=gardenlinux&submodules=1";
2734
edk2-src.flake = false;
2835

@@ -73,6 +80,7 @@
7380
edk2-src,
7481
fcntl-tool,
7582
libvirt,
83+
libvirt-prev,
7684
nixpkgs,
7785
...
7886
}:
@@ -82,6 +90,8 @@
8290
fcntl-tool = fcntl-tool.packages.default;
8391
cloud-hypervisor = toDebugOptimizedChv cloud-hypervisor.packages.default;
8492
cloud-hypervisor-prev = toDebugOptimizedChv cloud-hypervisor-prev.packages.default;
93+
libvirt = libvirt;
94+
libvirt-prev = libvirt-prev;
8595
python3Packages = prev.python3Packages.overrideScope (
8696
_: _: {
8797
inherit test-helper;
@@ -234,7 +244,7 @@
234244
# We export all artifacts that we also have in the tests.
235245
packages = {
236246
# Export of the overlay'ed package
237-
inherit (pkgs) cloud-hypervisor cloud-hypervisor-prev;
247+
inherit (pkgs) cloud-hypervisor cloud-hypervisor-prev libvirt libvirt-prev;
238248
inherit nixos-image;
239249
chv-ovmf = pkgs.runCommand "OVMF-CLOUHDHV.fd" { } ''
240250
cp ${chv-ovmf.fd}/FV/CLOUDHV.fd $out
@@ -246,7 +256,6 @@
246256
nixos-image
247257
chv-ovmf
248258
;
249-
libvirt = libvirt.packages.libvirt-debugoptimized;
250259
};
251260
}
252261
);

0 commit comments

Comments
 (0)