From: Tom Clegg <tom@curii.com>
Date: Thu, 10 Mar 2022 15:35:09 +0000 (-0500)
Subject: 18700: iceweasel->firefox for debian>10, drop from non-test env.
X-Git-Tag: 2.5.0~214^2~31
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/b106d92f8032f8ded98860f5c2da381ae04ec5a7

18700: iceweasel->firefox for debian>10, drop from non-test env.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/install/deps.go b/lib/install/deps.go
index d4b79ace23..d31de66b18 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -143,7 +143,6 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
 			"default-jdk-headless",
 			"default-jre-headless",
 			"gettext",
-			"iceweasel",
 			"libattr1-dev",
 			"libcrypt-ssleay-perl",
 			"libfuse-dev",
@@ -181,10 +180,15 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
 			"wget",
 			"xvfb",
 		)
+		if test {
+			if osv.Debian && osv.Major <= 10 {
+				pkgs = append(pkgs, "iceweasel")
+			} else {
+				pkgs = append(pkgs, "firefox")
+			}
+		}
 		if dev || test {
-			pkgs = append(pkgs,
-				"squashfs-tools", // for singularity
-			)
+			pkgs = append(pkgs, "squashfs-tools") // for singularity
 		}
 		switch {
 		case osv.Debian && osv.Major >= 10: