Luke Granger-Brown
f64e68e09b
Merge pull request #120071 from johanot/ceph-16
...
ceph: 15.2.10 -> 16.2.1
2021-04-29 00:03:45 +01:00
Samuel Dionne-Riel
1f4dedfa64
Merge pull request #120667 from samueldr/fix/grub1-test
...
nixosTests.installer: Fix grub1 test being unreliable
2021-04-27 19:32:13 -04:00
talyz
1215bd4ea9
Revert "nixos/tests/gitlab: add 32 byte secrets"
...
This reverts commit d6e0d38b84
2021-04-27 18:08:59 +02:00
Luke Granger-Brown
825a9ad1f9
Merge pull request #120286 from lukegb/hibernate-install
...
nixos/tests/hibernate: install a system instead
2021-04-26 18:00:41 +01:00
Samuel Dionne-Riel
7d112134de
nixosTests.installer: Fix grub1 test being unreliable
...
The kernel sometimes assigns `/dev/sdb` to the 8GiB disk. This, in turn,
means the test will fail because we're targeting the wrong disk.
```
machine # [ 0.000000] sd 2:0:0:0: [sda] 16777216 512-byte logical blocks: (8.59 GB/8.00 GiB)
machine # [ 0.000000] sd 3:0:0:0: [sdb] 1048576 512-byte logical blocks: (537 MB/512 MiB)
```
```
machine # [ 0.000000] sd 2:0:0:0: [sdb] 16777216 512-byte logical blocks: (8.59 GB/8.00 GiB)
machine # [ 0.000000] sd 3:0:0:0: [sda] 1048576 512-byte logical blocks: (537 MB/512 MiB)
```
Note how the "sd x:0:0:0:` ID is stable. That is because QEMU **is**
told to give specific identifiers to the disks. So using the
dev/disk/by-id/ identifiers is stable.
* * *
Tested by forcing the sda/sdb swap this way:
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 24c55081f9a..2eee224351b 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -702,12 +702,19 @@ in {
+ " mkpart primary linux-swap 1M 1024M"
+ " mkpart primary ext2 1024M -1s",
"udevadm settle",
+ )
+ print(machine.succeed("find /dev/disk/ '!' -type d -printf '%p → %l\n' | sort"))
+ machine.succeed(
"mkswap ${grubDevice}-part1 -L swap",
"swapon -L swap",
"mkfs.ext3 -L nixos ${grubDevice}-part2",
"mount LABEL=nixos /mnt",
"mkdir -p /mnt/tmp",
)
+ machine.succeed("echo success")
+ machine.succeed(
+ 'if [[ "$(find ${grubDevice} -printf \'%l\')" != "../../sdb" ]]; then exit 22; else true; fi'
+ )
'';
grubVersion = 1;
# /dev/sda is not stable, even when the SCSI disk number is.
And ran this way:
$ until (clear; tmux clear ; time env -i nix-build nixos/release-combined.nix -A nixos.tests.installer.grub1.x86_64-linux); do echo derp; done
2021-04-25 19:59:29 -04:00
Luke Granger-Brown
ed83f6455c
Merge pull request #119443 from ambroisie/add-podgrab
...
Add podgrab package and module
2021-04-25 14:12:40 +01:00
Frederik Rietdijk
c648f7ee2a
Merge master into staging-next
2021-04-25 13:54:29 +02:00
Luke Granger-Brown
0cc25061b0
Merge pull request #114240 from sorki/containers/nested
...
nixos/nixos-containers: default boot.enableContainers to true
2021-04-25 11:37:01 +01:00
github-actions[bot]
a956f62ea4
Merge master into staging-next
2021-04-25 06:05:34 +00:00
Jan Tojnar
0f1c4558d3
Merge branch 'master' into staging-next
...
Choose binwalk 2.3.1, 27 is legacy version for Python 2.
2021-04-25 02:50:48 +02:00
Martin Weinelt
ceb26b53d8
nixos/tests/babeld: drop forwarding sysctls
...
They are now set as part of the babeld module.
2021-04-25 00:55:05 +02:00
Maximilian Bosch
7b2982e22e
Merge pull request #119498 from mweinelt/tests-bird
...
nixos/test/prometheus-exporters/bird: fix race condition
2021-04-24 21:13:09 +02:00
github-actions[bot]
6e7c70d02d
Merge master into staging-next
2021-04-24 00:16:17 +00:00
Martin Weinelt
fc55a1bdd4
nixos/tests/prometheus-exporters/bird: set router id
...
Previously bird would refuse to start up because the router id wasn't
set.
> bird[682]: Cannot determine router ID, please configure it manually
2021-04-23 23:34:26 +02:00
Maximilian Bosch
f62b42f405
Merge pull request #120125 from BBBSnowball/pr-add-config-nextcloud-imagick-rename-option
...
nixos/nextcloud: Rename option disableImagemagick to enableImagemagick
2021-04-23 23:27:34 +02:00
Luke Granger-Brown
32d80aaaa5
nixos/tests/hibernate: install a system instead
...
Rather than relying on carefully avoiding touching the 9P-mounted
/nix/store, we instead install a small NixOS system, similar to
the installer tests, and boot from that.
This avoids the various pitfalls associated with trying to unsuspend
properly and trades off a bunch of boilerplate for what will hopefully
be a more reliable test.
Additionally, this test now actually tests booting the system using a
bootloader, rather than the previous method of just booting the kernel
directly.
2021-04-23 01:30:38 +00:00
github-actions[bot]
b95da5efb6
Merge master into staging-next
2021-04-22 18:14:27 +00:00
github-actions[bot]
120744d620
Merge master into staging-next
2021-04-22 12:06:24 +00:00
Johan Thomsen
8a6e130c71
nixos/ceph: fix tests
...
- 512 -> 1024MB vm memory (had sporadic oom-failures with the lower setting)
- set "auth_allow_insecure_global_id_reclaim=false" as described here: https://docs.ceph.com/en/latest/security/CVE-2021-20288/
2021-04-22 13:17:57 +02:00
Jörg Thalheim
40945d399d
quagga: remove
...
Upstream repositories do no longer exists. There has been no release in
a while. - Not a good combination for a network daemon running as root
in C that parses network packets...
2021-04-22 12:48:48 +02:00
Michael Weiss
3e01d42024
maintainers: remove tavyc
...
Their last commit was dcc84d8
2021-04-22 11:34:25 +02:00
Benjamin Koch
8122221c9b
nixos/nextcloud: Rename services.nextcloud.nginx.disableImagemagick to services.nextcloud.nginx.enableImagemagick
...
Enable options are preferred. Suggested here:
https://github.com/NixOS/nixpkgs/pull/115372#issuecomment-821900334
2021-04-22 02:17:12 +02:00
github-actions[bot]
9b3e698b14
Merge master into staging-next
2021-04-21 12:06:23 +00:00
Oleksii Filonenko
c2900f685f
Merge pull request #111518 from Jaculabilis/nebula
...
nixos/nebula: add basic module
2021-04-21 11:17:30 +03:00
github-actions[bot]
6ef7c23763
Merge master into staging-next
2021-04-19 18:11:51 +00:00
Lorenz Leutgeb
0b0cd3f6aa
mxisd: remove ( #119372 )
...
* mxisd: remove
See EOL notice at https://github.com/kamax-matrix/mxisd/blob/master/EOL.md#end-of-life-notice
* mxisd: Add throwing EOL notice
2021-04-19 11:26:08 -04:00
github-actions[bot]
a28d31ed86
Merge master into staging-next
2021-04-19 00:15:22 +00:00
Michele Guerini Rocco
27b95afbb8
Merge pull request #119529 from Lassulus/searx_1.0.0
...
searx: 0.18.0 -> 1.0.0
2021-04-19 00:38:09 +02:00
rnhmjoj
d0d77ec032
nixos/tests/searx: fix for 1.0 update
2021-04-19 00:13:05 +02:00
github-actions[bot]
b57b2b362c
Merge master into staging-next
2021-04-18 18:10:37 +00:00
sternenseemann
f85086f6c3
nixos/tests/packagekit: fix test machine evaluation
...
aa22be179a
2021-04-18 18:40:06 +02:00
Morgan Jones
064e0af80b
nixos/nebula: Add enable option defaulting to true to Nebula networks
2021-04-16 19:57:02 -07:00
github-actions[bot]
d4f421cad9
Merge master into staging-next
2021-04-16 12:06:14 +00:00
Robert Hensing
578acc7a42
Merge pull request #118018 from considerate/master
...
dockerTools: Implement merging of image tarballs
2021-04-16 09:17:44 +02:00
ajs124
90f6033984
nixos/tests/dovecot: set mailUser and mailGroup
2021-04-16 00:43:11 +02:00
Bruno BELANYI
1144486f3a
nixos/tests/podgrab: init
2021-04-15 20:57:22 +00:00
Martin Weinelt
65234f0911
nixos/test/prometheus-exporters/bird: fix race condition
...
The bird socket would not always be instantly present, when the exporter
was queried, leading to the test sometimes failing in its entirety.
2021-04-15 03:18:07 +02:00
Martin Weinelt
7cf67850c0
Merge branch 'master' into staging-next
2021-04-15 01:01:26 +02:00
Guillaume Girol
f1a2ab6818
Merge pull request #115332 from symphorien/usertype
...
nixos/users: require one of users.users.name.{isSystemUser,isNormalUser}
2021-04-14 19:38:26 +00:00
Symphorien Gibol
7a87973b4c
nixos/users: require one of users.users.name.{isSystemUser,isNormalUser}
...
As the only consequence of isSystemUser is that if the uid is null then
it's allocated below 500, if a user has uid = something below 500 then
we don't require isSystemUser to be set.
Motivation: https://github.com/NixOS/nixpkgs/issues/112647
2021-04-14 20:40:00 +02:00
Vladimír Čunát
d2eb7a7887
Merge branch 'staging' into staging-next
...
A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
Graham Christensen
d72a60a59f
Merge pull request #115590 from grahamc/iscsi
...
NixOS: services.{openiscsi, target}, boot.iscsi-initiator: init
2021-04-13 13:19:34 -04:00
sternenseemann
17efdfbbca
nixos/tests/kernel-generic: make attributes derivations, not functions
...
Pass the args from kernel-generic.nix's top-level to the individual
tests. Makes `nix-build -A nixosTests.kernel-generic.<attr>` and
`nix-build nixos/tests/kernel-generic.nix -A <attr>` work as expected.
2021-04-13 16:13:11 +02:00
Maximilian Bosch
db47ed4382
Merge pull request #119127 from Ma27/bump-gitea
...
gitea: 1.13.7 -> 1.14.0
2021-04-12 17:46:19 +02:00
Sandro
512e44abb1
Merge pull request #101852 from takagiy/init-wmderland
2021-04-12 16:44:46 +02:00
Maximilian Bosch
f17950c5b7
gitea: 1.13.7 -> 1.14.0
...
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.14.0
2021-04-11 13:39:39 +02:00
sternenseemann
76583ee81a
nixos/spacecookie: convert into settings-style freeform configuration
...
* Move `hostname` and `root` into a settings submodule with a freeform
type, allowing users to also use options not known to the NixOS
service. Compatibility with a warning for the renamed options is also
trivial to achieve.
* `port` stays where it is as we don't actually use the `port` option of
spacecookie to set up the socket, but only to inform spacecookie about
the port we have set in the `systemd.socket` file, this makes more
sense. Additionally the configuration of the listening port and
address change in the next spacecookie release — we can dodge this
issue altogether by doing our own thing, but I'm interested to hear
opinions on this.
To ensure that this is not misconfigured, we add an assertion for
the port option.
* Add an assertion for `user` in settings which has no effect the way
we are starting spacecookie as it wouldn't be able to call setuid.
The message also explains how a specific user can be used with
spacecookie if desired.
2021-04-10 15:44:19 +02:00
sternenseemann
d1f57cbaf0
nixos/spacecookie: add openFirewall option
...
Convenience shortcut which automatically configures the firewall to open
the port which is also configured for the spacecookie service.
2021-04-10 15:44:19 +02:00
sternenseemann
8abd77c811
nixos/tests/spacecookie: refactor
...
* Use proper gopher urls
* The client vms name is also controlled in a single place now
* fileContent holds the precise file content now
* wait for the spacecookie unit instead of the port
* avoids sending an empty request
* since spacecookie is a notify service it only is fully started when
the socket has been set up.
2021-04-10 15:44:19 +02:00
Jörg Thalheim
f7e08360b0
Merge pull request #117456 from Izorkin/update-redis-options
...
nixos/redis: add option and change access to directories
2021-04-10 06:06:19 +01:00
