nixos/release-combined.nix: fix tested/supportedSystems (master version of #82886) #83249
Conversation
worldofpeace
requested review from
edolstra,
vcunat,
grahamc,
samueldr,
flokli,
fpletz,
andir and
Ma27
|
My assumption was that @edolstra cut the dependency on other platforms intentionally in 2de3caf, but the commit doesn't explicitly comment on that point (say, some reasons). As for different |
|
I believe we need some overall thought on the design we have around the jobsets and channels with regards to platforms. Currently we seem to be stuck half-way between separated and integrated aarch64. For instance, if I were aarch64 user, I wouldn't really know what channel/commit to follow. The channel-advancing jobsets like trunk-combined only contain aarch64 tests but no packages, so channels might advance before most binaries are there 🤷♂️ There are separate jobsets to get most aarch64 binaries (e.g. release-20.03-aarch64 which is currently stuck due to this eval error, but that's a detail), but I see no convenient way to "follow" these without a channel/branch. Well, maybe I'm missing something and you can correct me... |
We can still do that if we want, I just wanted to get to a base version that is close to the original and allows to easily select tests that only run on aarch64. I decided to keep everything that could possibly work on aarch64 (BIOS tests definitely won't) since it was the easiest criteria. |
We were talking about that lightly on Though, now that we can we would like to make aarch64-linux part of the main eval. The previous issue with the GC being unable to cope with the full list of package was what was preventing this to be done. Now that it is fixed (with the string job names) we should be good to go for 20.09 |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/nixos-unstable-hasnt-been-updated-in-a-month/6584/1 |
This properly supports the `supportedSystems` and `limitedSupportedSystems` arguments of `release-combined.nix`. Previously, evaluation would fail if `x86_64-linux` was not part either of those, since the tested job always referenced the `x86_64-linux` nixos tests (which won't exist in an aarch64-only eval). Since the hydra configuration for the jobset`trunk-combined` has both `aarch64-linux` and `x86_64-linux` as supported systems, this will make aarch64 be part of the tested job on that jobset.
bennofs
force-pushed
the
fix-nixos-aarch64-eval-master
branch
from
7b21a54
to
918cb88
Compare
|
Rebased to fix merge conflict. |
|
The second commit also needs backport to |
This properly supports the
supportedSystemsandlimitedSupportedSystemsarguments ofrelease-combined.nix.Previously, evaluation would fail if
x86_64-linuxwas not part eitherof those, since the tested job always referenced the
x86_64-linuxnixos tests (which won't exist in an aarch64-only eval).
Since the hydra configuration for the jobset
trunk-combinedhas bothaarch64-linuxandx86_64-linuxas supported systems, this will makeaarch64 be part of the tested job on that jobset.
This is the version of #82886 for master.