From 41a829aae73e07a857557e1b1db0545b341e0f64 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 26 Oct 2022 13:31:51 +0800
Subject: [PATCH 1/2] Allow selenium version to be specified

---
 runner/master/run.sh | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/runner/master/run.sh b/runner/master/run.sh
index a630f1a..a8f3337 100755
--- a/runner/master/run.sh
+++ b/runner/master/run.sh
@@ -33,6 +33,14 @@ export PLUGINSTOINSTALL="${PLUGINSTOINSTALL:-}"
 # Plugin folder where the plugins to install will be downloaded.
 export PLUGINSDIR="${PLUGINSDIR:-${WORKSPACE}/plugins}"
 
+# Select image versions for Firefox and Chrome
+SELVERSION="${SELVERSION:-3.141.59}"
+SELCHROMEIMAGE="${SELIMAGE:-selenium/standalone-chrome:${SELVERSION}}"
+SELFIREFOXIMAGE="${SELIMAGE:-selenium/standalone-firefox:${SELVERSION}}"
+
+# Temporarily switching to custom image to include our bugfix for zero size failures.
+SELCHROMEIMAGE="${SELIMAGE:-moodlehq/selenium-standalone-chrome:96.0-moodlehq}"
+
 mkdir -p "${PLUGINSDIR}"
 if [ -n "$PLUGINSTOINSTALL" ];
 then
@@ -257,6 +265,9 @@ echo "== MOBILE_VERSION: ${MOBILE_VERSION}"
 echo "== PLUGINSTOINSTALL: ${PLUGINSTOINSTALL}"
 echo "== TESTSUITE: ${TESTSUITE}"
 echo "== Environment: ${ENVIROPATH}"
+echo "== Selenium version: ${SELVERSION}"
+echo "== Chrome image: ${SELCHROMEIMAGE}"
+echo "== Firefox image: ${SELFIREFOXIMAGE}"
 echo "============================================================================"
 
 # Setup the image cleanup.
@@ -671,19 +682,6 @@ then
   SHMMAP="--shm-size=2g"
 
   HASSELENIUM=1
-  SELVERSION="3.141.59"
-  # We are going brave here and go back to unpinned chrome version, because staying with
-  # the old Chrome 79 version (3.141.59-zinc) is making things really harder and harder.
-  # We are aware that, for headed runs, there are some zero-size errors still not fixed,
-  # but headless ones should run ok. For reference, the problems we are aware are being
-  # tracked (as of 14 Sep 2021) @:
-  #   - MDL-71108 : zero-size
-  #   - MDL-72306 : feedback
-  SELCHROMEIMAGE="selenium/standalone-chrome:${SELVERSION}"
-  SELFIREFOXIMAGE="selenium/standalone-firefox:${SELVERSION}"
-
-  # Temporarily switching to custom image to include our bugfix for zero size failures.
-  SELCHROMEIMAGE="moodlehq/selenium-standalone-chrome:96.0-moodlehq"
 
   # Newer versions of Firefox do not allow Marionette to be disabled.
   # Version 47.0.1 is the latest version of Firefox we can support when Marionette is disabled.

From 2b144de3b6f344d848215369bc9cf1ecd07cf505 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 15 Nov 2022 20:27:41 +0800
Subject: [PATCH 2/2] Switch to Selenium 4 images

These are now passing with all of our tests.

Fixes #71
---
 runner/master/run.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/runner/master/run.sh b/runner/master/run.sh
index a8f3337..1e513ba 100755
--- a/runner/master/run.sh
+++ b/runner/master/run.sh
@@ -34,13 +34,10 @@ export PLUGINSTOINSTALL="${PLUGINSTOINSTALL:-}"
 export PLUGINSDIR="${PLUGINSDIR:-${WORKSPACE}/plugins}"
 
 # Select image versions for Firefox and Chrome
-SELVERSION="${SELVERSION:-3.141.59}"
+SELVERSION="${SELVERSION:-4}"
 SELCHROMEIMAGE="${SELIMAGE:-selenium/standalone-chrome:${SELVERSION}}"
 SELFIREFOXIMAGE="${SELIMAGE:-selenium/standalone-firefox:${SELVERSION}}"
 
-# Temporarily switching to custom image to include our bugfix for zero size failures.
-SELCHROMEIMAGE="${SELIMAGE:-moodlehq/selenium-standalone-chrome:96.0-moodlehq}"
-
 mkdir -p "${PLUGINSDIR}"
 if [ -n "$PLUGINSTOINSTALL" ];
 then