From 7c7cd3c39745042ac0a6a97663143f8fcfc5e2be Mon Sep 17 00:00:00 2001
From: Dominic Feliton <dafeliton@ucsd.edu>
Date: Mon, 18 Sep 2023 15:03:20 -0700
Subject: [PATCH] Rewrite selenium_setup.sh, test integration

---
 images/spec.yml           |  2 +-
 scripts/selenium_setup.sh | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/images/spec.yml b/images/spec.yml
index 8fe9b656..5168872e 100644
--- a/images/spec.yml
+++ b/images/spec.yml
@@ -12,7 +12,7 @@ images:
   rstudio-notebook:
     image_name: ghcr.io/ucsd-ets/rstudio-notebook
     depend_on: datascience-notebook
-    integration_tests: false
+    integration_tests: true
     info_cmds: [PY_VER, PIP_LIST, CONDA_INFO, CONDA_LIST, APT_PKG_LIST]
     prune: true
 
diff --git a/scripts/selenium_setup.sh b/scripts/selenium_setup.sh
index 57ab5e2b..abaa4889 100644
--- a/scripts/selenium_setup.sh
+++ b/scripts/selenium_setup.sh
@@ -1,23 +1,32 @@
 #!/bin/bash
 
 # File google-chrome.list allows `apt update` to fetch the latest stable of Chrome
-#sudo bash -c "echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' >> /etc/apt/sources.list.d/google-chrome.list"
-sudo bash -c "echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.90-1_amd64.deb' >> /etc/apt/sources.list.d/google-chrome.list"
+# OLD: sudo bash -c "echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.90-1_amd64.deb' >> /etc/apt/sources.list.d/google-chrome.list"
+
+# Prepare chrome repo
+wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+
+echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list
 
 sudo apt -y update
+
 # Install latest Chrome
-sudo apt -y install google-chrome-stable 
+sudo apt -y install google-chrome-stable unzip
 chrome_version=$(grep -iEo "[0-9.]{10,20}" <(google-chrome --version))
 echo "The stable Chrome version is: ${chrome_version}"
 
 # ISSUE: Chrome driver may not have the same latest version for download
 # Workaround: fetch the LATEST_RELEASE version available for download
-driver_version=$(curl -s -L https://chromedriver.storage.googleapis.com/LATEST_RELEASE_114)
+# OLD: driver_version=$(curl -s -L https://chromedriver.storage.googleapis.com/LATEST_RELEASE_114)
+
+# Download latest chrome driver, instead of above methods
+driver_version=$(curl -s -L https://googlechromelabs.github.io/chrome-for-testing/LATEST_RELEASE_STABLE)
 echo "Latest Chrome driver version is: ${driver_version}"
-wget https://chromedriver.storage.googleapis.com/${driver_version}/chromedriver_linux64.zip
+# OLD: wget https://chromedriver.storage.googleapis.com/${driver_version}/chromedriver_linux64.zip
+wget https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${driver_version}/linux64/chromedriver-linux64.zip
 
 # install Chrome Driver
-unzip chromedriver_linux64.zip 
-sudo mv chromedriver /usr/bin/chromedriver 
+unzip chromedriver-linux64.zip 
+sudo mv chromedriver-linux64/chromedriver /usr/bin/chromedriver 
 sudo chown root:root /usr/bin/chromedriver 
 sudo chmod +x /usr/bin/chromedriver