summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2023-10-10 12:18:45 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-10-14 14:01:50 +0000
commitea94c069ac579f3f35a3057b1ce2b5cd5ecf2590 (patch)
tree78fbf9293d74734e5d380d814c1c9432bafd96ad
parentMerge pull request #261015 from NixOS/backport-259269-to-release-23.05 (diff)
downloadnixpkgs-ea94c069ac579f3f35a3057b1ce2b5cd5ecf2590.tar.gz
nixos/release: don't block on firefox tests
I can't recall when these tests last discovered a real problem. Having to do many manual restarts is annoying, e.g. https://hydra.nixos.org/build/237622614#tabs-buildsteps (cherry picked from commit 3b6389aa2f49e87846760c8220387a2f4d27279f)
-rw-r--r--nixos/release-combined.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 29dcdab7d18e..9c46409312aa 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -67,8 +67,15 @@ in rec {
(onSystems ["x86_64-linux"] "nixos.tests.docker")
(onFullSupported "nixos.tests.ecryptfs")
(onFullSupported "nixos.tests.env")
- (onFullSupported "nixos.tests.firefox-esr")
- (onFullSupported "nixos.tests.firefox")
+
+ # Way too many manual retries required on Hydra.
+ # Apparently it's hard to track down the cause.
+ # So let's depend just on the packages for now.
+ #(onFullSupported "nixos.tests.firefox-esr")
+ #(onFullSupported "nixos.tests.firefox")
+ (onFullSupported "nixpkgs.firefox-esr")
+ (onFullSupported "nixpkgs.firefox")
+
(onFullSupported "nixos.tests.firewall")
(onFullSupported "nixos.tests.fontconfig-default-fonts")
(onFullSupported "nixos.tests.gnome")