summary refs log tree commit diff
path: root/nixos/release-combined.nix
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2023-10-10 12:18:45 +0200
committerVladimír Čunát <v@cunat.cz>2023-10-10 12:19:27 +0200
commit3b6389aa2f49e87846760c8220387a2f4d27279f (patch)
treecec038270d7109ad935cd395779cf9313977c3ed /nixos/release-combined.nix
parent08170dd535bd9a9512f14088e72a64a6057c1fab (diff)
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
Diffstat (limited to 'nixos/release-combined.nix')
-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 29dcdab7d18e5..9c46409312aa0 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")