From 773959ec5759b62d0c748eaab800fa348b1ebbb5 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Mon, 22 Feb 2021 04:37:57 -0500
Subject: [PATCH] CI: Delete old Sauce Connect logic

---
 src/tests/frontend/travis/adminrunner.sh  |  4 ---
 src/tests/frontend/travis/runner.sh       |  4 ---
 src/tests/frontend/travis/sauce_tunnel.sh | 37 -----------------------
 3 files changed, 45 deletions(-)
 delete mode 100755 src/tests/frontend/travis/sauce_tunnel.sh

diff --git a/src/tests/frontend/travis/adminrunner.sh b/src/tests/frontend/travis/adminrunner.sh
index 8f57ac6fb..9ed6d5e74 100755
--- a/src/tests/frontend/travis/adminrunner.sh
+++ b/src/tests/frontend/travis/adminrunner.sh
@@ -6,9 +6,6 @@ error() { log "ERROR: $@" >&2; }
 fatal() { error "$@"; exit 1; }
 try() { "$@" || fatal "'$@' failed"; }
 
-[ -n "${SAUCE_USERNAME}" ] || fatal "SAUCE_USERNAME is unset - exiting"
-[ -n "${SAUCE_ACCESS_KEY}" ] || fatal "SAUCE_ACCESS_KEY is unset - exiting"
-
 # Move to the Etherpad base directory.
 MY_DIR=$(try cd "${0%/*}" && try pwd -P) || exit 1
 try cd "${MY_DIR}/../../../.."
@@ -38,7 +35,6 @@ log "Starting the remote runner..."
 node remote_runner.js admin
 exit_code=$?
 
-kill "$(cat /tmp/sauce.pid)"
 kill "$ep_pid" && wait "$ep_pid"
 log "Done."
 exit "$exit_code"
diff --git a/src/tests/frontend/travis/runner.sh b/src/tests/frontend/travis/runner.sh
index 5a16ccceb..23bc13ed7 100755
--- a/src/tests/frontend/travis/runner.sh
+++ b/src/tests/frontend/travis/runner.sh
@@ -6,9 +6,6 @@ error() { log "ERROR: $@" >&2; }
 fatal() { error "$@"; exit 1; }
 try() { "$@" || fatal "'$@' failed"; }
 
-[ -n "${SAUCE_USERNAME}" ] || fatal "SAUCE_USERNAME is unset - exiting"
-[ -n "${SAUCE_ACCESS_KEY}" ] || fatal "SAUCE_ACCESS_KEY is unset - exiting"
-
 # Move to the Etherpad base directory.
 MY_DIR=$(try cd "${0%/*}" && try pwd -P) || exit 1
 try cd "${MY_DIR}/../../../.."
@@ -38,7 +35,6 @@ log "Starting the remote runner..."
 node remote_runner.js
 exit_code=$?
 
-kill "$(cat /tmp/sauce.pid)"
 kill "$ep_pid" && wait "$ep_pid"
 log "Done."
 exit "$exit_code"
diff --git a/src/tests/frontend/travis/sauce_tunnel.sh b/src/tests/frontend/travis/sauce_tunnel.sh
deleted file mode 100755
index 45827d31e..000000000
--- a/src/tests/frontend/travis/sauce_tunnel.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-pecho() { printf %s\\n "$*"; }
-log() { pecho "$@"; }
-error() { log "ERROR: $@" >&2; }
-fatal() { error "$@"; exit 1; }
-try() { "$@" || fatal "'$@' failed"; }
-
-[ -n "${SAUCE_USERNAME}" ] || fatal "SAUCE_USERNAME is unset - exiting"
-[ -n "${SAUCE_ACCESS_KEY}" ] || fatal "SAUCE_ACCESS_KEY is unset - exiting"
-
-# download and unzip the sauce connector
-#
-# ACHTUNG: as of 2019-12-21, downloading sc-latest-linux.tar.gz does not work.
-# It is necessary to explicitly download a specific version, for example
-# https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz Supported versions are
-# currently listed at:
-# https://wiki.saucelabs.com/display/DOCS/Downloading+Sauce+Connect+Proxy
-try curl -o /tmp/sauce.tar.gz \
-    https://saucelabs.com/downloads/sc-4.6.2-linux.tar.gz
-try tar zxf /tmp/sauce.tar.gz --directory /tmp
-try mv /tmp/sc-*-linux /tmp/sauce_connect
-
-# start the sauce connector in background and make sure it doesn't output the
-# secret key
-try rm -f /tmp/tunnel
-/tmp/sauce_connect/bin/sc \
-    --user "${SAUCE_USERNAME}" \
-    --key "${SAUCE_ACCESS_KEY}" \
-    -i "${TRAVIS_JOB_NUMBER}" \
-    --pidfile /tmp/sauce.pid \
-    --readyfile /tmp/tunnel >/dev/null &
-
-# wait for the tunnel to build up
-while ! [ -e "/tmp/tunnel" ]; do
-    sleep 1
-done