From 1a5e9b496ad13550a25871ed517429c0b679d48d Mon Sep 17 00:00:00 2001
From: Gabe Kangas <gabek@real-ity.com>
Date: Thu, 16 Mar 2023 10:43:49 -0700
Subject: [PATCH] Split local and S3 HLS tests

---
 .github/workflows/hls-tests.yml | 11 +++++++++--
 test/automated/hls/run-s3.sh    | 35 +++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 test/automated/hls/run-s3.sh

diff --git a/.github/workflows/hls-tests.yml b/.github/workflows/hls-tests.yml
index a34a7c4c5..e6a46ccfa 100644
--- a/.github/workflows/hls-tests.yml
+++ b/.github/workflows/hls-tests.yml
@@ -1,4 +1,4 @@
-name: Automated HLS tests
+name: HLS tests
 
 on:
   push:
@@ -42,9 +42,16 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
-      - name: Run HLS tests
+      - name: Local stroage
         uses: nick-fields/retry@v2
         with:
           timeout_minutes: 10
           max_attempts: 3
           command: cd test/automated/hls && ./run.sh
+
+      - name: S3 storage
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 10
+          max_attempts: 3
+          command: cd test/automated/hls && ./run-s3.sh
diff --git a/test/automated/hls/run-s3.sh b/test/automated/hls/run-s3.sh
new file mode 100644
index 000000000..bd610da10
--- /dev/null
+++ b/test/automated/hls/run-s3.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+
+# Determine if we should continue testing with S3 configuration.
+if [[ -z "${S3_BUCKET}" ]]; then
+	echo "No S3 configuration is set. Skipping S3 tests!"
+	exit 0
+fi
+
+source ../tools.sh
+
+# Install the node test framework
+npm install --silent >/dev/null
+
+install_ffmpeg
+
+start_owncast
+
+start_stream
+
+sleep 10
+
+# Run tests against a fresh install with no settings.
+npm test
+
+# Update the server config to use S3 for storage.
+update_storage_config
+
+start_stream
+
+sleep 10
+
+# Re-run the HLS test against the external storage configuration.
+npm test