From 6442a780c60d9144a062c8af6b887f3213005751 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Sun, 12 Nov 2023 00:55:54 -0500 Subject: [PATCH] 20690: Remove phantomjs and geckodriver (wb1 test deps). Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- build/run-tests.sh | 4 ---- lib/install/deps.go | 28 ---------------------------- 2 files changed, 32 deletions(-) diff --git a/build/run-tests.sh b/build/run-tests.sh index a869d0f6a7..2aa42b2c3b 100755 --- a/build/run-tests.sh +++ b/build/run-tests.sh @@ -241,14 +241,10 @@ sanity_checks() { || fatal "No libpam pam_appl.h. Try: apt-get install libpam0g-dev" echo -n 'postgresql: ' psql --version || fatal "No postgresql. Try: apt-get install postgresql postgresql-client-common" - echo -n 'phantomjs: ' - phantomjs --version || fatal "No phantomjs. Try: apt-get install phantomjs" echo -n 'xvfb: ' which Xvfb || fatal "No xvfb. Try: apt-get install xvfb" echo -n 'graphviz: ' dot -V || fatal "No graphviz. Try: apt-get install graphviz" - echo -n 'geckodriver: ' - geckodriver --version | grep ^geckodriver || echo "No geckodriver. Try: arvados-server install" echo -n 'singularity: ' singularity --version || fatal "No singularity. Try: arvados-server install" echo -n 'docker client: ' diff --git a/lib/install/deps.go b/lib/install/deps.go index de61c5cd43..5bdc71fddd 100644 --- a/lib/install/deps.go +++ b/lib/install/deps.go @@ -36,8 +36,6 @@ const ( rubyversion = "2.7.7" bundlerversion = "2.2.19" singularityversion = "3.10.4" - pjsversion = "1.9.8" - geckoversion = "0.24.0" gradleversion = "5.3.1" nodejsversion = "v12.22.12" devtestDatabasePassword = "insecure_arvados_test" @@ -340,32 +338,6 @@ ln -sfv /var/lib/arvados/go/bin/* /usr/local/bin/ } if !prod && !pkg { - if havepjsversion, err := exec.Command("/usr/local/bin/phantomjs", "--version").CombinedOutput(); err == nil && string(havepjsversion) == "1.9.8\n" { - logger.Print("phantomjs " + pjsversion + " already installed") - } else { - err = inst.runBash(` -PJS=phantomjs-`+pjsversion+`-linux-x86_64 -wget --progress=dot:giga -O- https://cache.arvados.org/$PJS.tar.bz2 | tar -C /var/lib/arvados -xjf - -ln -sfv /var/lib/arvados/$PJS/bin/phantomjs /usr/local/bin/ -`, stdout, stderr) - if err != nil { - return 1 - } - } - - if havegeckoversion, err := exec.Command("/usr/local/bin/geckodriver", "--version").CombinedOutput(); err == nil && strings.Contains(string(havegeckoversion), " "+geckoversion+" ") { - logger.Print("geckodriver " + geckoversion + " already installed") - } else { - err = inst.runBash(` -GD=v`+geckoversion+` -wget --progress=dot:giga -O- https://github.com/mozilla/geckodriver/releases/download/$GD/geckodriver-$GD-linux64.tar.gz | tar -C /var/lib/arvados/bin -xzf - geckodriver -ln -sfv /var/lib/arvados/bin/geckodriver /usr/local/bin/ -`, stdout, stderr) - if err != nil { - return 1 - } - } - if havegradleversion, err := exec.Command("/usr/local/bin/gradle", "--version").CombinedOutput(); err == nil && strings.Contains(string(havegradleversion), "Gradle "+gradleversion+"\n") { logger.Print("gradle " + gradleversion + " already installed") } else { -- 2.30.2