diff options
| author | Collin J. Doering | 2024-11-07 23:39:34 -0500 |
|---|---|---|
| committer | Collin J. Doering | 2024-11-07 23:39:34 -0500 |
| commit | 87b4c4ee2df2851d90d3d8a6d5ccb77bd860bbae (patch) | |
| tree | d149ea5e38a06078189c98f129737df75c442495 /.guix/guix-na | |
| parent | ce3ebaacde32cb4d324c7d9b8b168d3fc9d5449e (diff) | |
| download | guix-north-america-87b4c4ee2df2851d90d3d8a6d5ccb77bd860bbae.tar.gz | |
balg02: Bypass failing tests in coreutils on btrfs
* .guix/guix-na/config/balg02.scm: Add tmpfs based /tmp file-system. This bypasses the issue
seen on cuiass.genenetwork.org, where the 'tests/cp/reflink-auto.sh' coreutils test was
failing, but not on other build farms or on my personal systems. Further root cause analysis
needs to take place, however btrfs' concept of subvolumes may be interfering with the test. A
partition outside of where the build is happening is located and selected by
coreutils ('coreutils/tests/other-fs-tmpdir'); which ends up selecting '/tmp'. guix-daemon
builds occur in /tmp. Because of this, the 'cp --reflink=auto ..' in the failing coreutils
test doesn't behave as expected, which in this case would be failing to create the reflink
because the files are expected to be on separate partitions. By using a tmpfs /tmp, coreutils
will select it during tests, and we can ensure guix-daemon uses a build location other then
/tmp (necessitating the following change).
(guix-daemon-config): Use /var/tmp for guix-daemon builds (so they are not built on tmpfs)
Diffstat (limited to '.guix/guix-na')
| -rw-r--r-- | .guix/guix-na/config/balg02.scm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/.guix/guix-na/config/balg02.scm b/.guix/guix-na/config/balg02.scm index fe25f27..88f5634 100644 --- a/.guix/guix-na/config/balg02.scm +++ b/.guix/guix-na/config/balg02.scm @@ -470,7 +470,8 @@ synonymous IETF language tags that should be mapped to the same $lang." (build-accounts (* build-accounts-to-max-jobs-ratio max-jobs)) (extra-options (list "--max-jobs" (number->string max-jobs) "--cores" (number->string cores) - "--gc-keep-derivations")))) + "--gc-keep-derivations")) + (tmpdir "/var/tmp"))) (define (balg02 efi-boot-uuid) (operating-system @@ -507,7 +508,12 @@ synonymous IETF language tags that should be mapped to the same $lang." (file-system (device (uuid efi-boot-uuid 'fat)) (mount-point "/boot/efi") - (type "vfat"))) + (type "vfat")) + (file-system + (device "none") + (mount-point "/tmp") + (type "tmpfs") + (check? #f))) %base-file-systems)) (swap-devices |