From a751d688b7624fae5b9ff1bbcc412bdbc2a6f510 Mon Sep 17 00:00:00 2001
From: Aidan Hembree <8049680+ahembree@users.noreply.github.com>
Date: Wed, 13 Dec 2023 00:13:42 +0000
Subject: [PATCH] i hate git

---
 .github/workflows/run-playbook.yml | 34 ++++++++++++------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/run-playbook.yml b/.github/workflows/run-playbook.yml
index ebdcc59..78ea896 100644
--- a/.github/workflows/run-playbook.yml
+++ b/.github/workflows/run-playbook.yml
@@ -1,5 +1,5 @@
-name: GitHub Actions Testing
-run-name: Test OS Deployments
+name: HMS-Docker Install Tests
+run-name: Test OS Installs
 on:
   push:
   workflow_dispatch:
@@ -8,7 +8,7 @@ permissions:
   contents: read
 
 jobs:
-  Ubuntu22_Basic:
+  Ubuntu_22:
     runs-on: ubuntu-22.04
     steps:
       - name: Check out repo code
@@ -17,25 +17,19 @@ jobs:
         run: |
           sudo apt update
           sudo apt install ansible make python3-pip
-      - name: Run playbook
+      - name: Ensure base playbook requirements
         run: |
           mkdir -p ./vars/custom
           cp vars/default/*.yml ./vars/custom
           mv ./vars/custom/main.yml ./vars/custom/main_custom.yml
-          sudo ansible-playbook -i inventory --connection local hms-docker.yml --diff --extra-vars "hms_docker_compose_container_state=absent hms_docker_container_map.transmission.enabled=no hms_docker_container_map.plex.enabled=no is_github_runner=yes"
-
-  Ubuntu22_Advanced:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Check out repo code
-        uses: actions/checkout@v4
-      - name: Install ansible
-        run: |
-          sudo apt update
-          sudo apt install ansible make python3-pip
+          sudo make install-reqs
       - name: Run playbook
-        run: |
-          mkdir -p ./vars/custom
-          cp roles/hmsdocker/defaults/main/*.yml ./vars/custom
-          mv ./vars/custom/main.yml ./vars/custom/main_custom.yml
-          sudo ansible-playbook -i inventory --connection local hms-docker.yml --diff --extra-vars "hms_docker_compose_container_state=absent hms_docker_container_map.transmission.enabled=no hms_docker_container_map.plex.enabled=no is_github_runner=yes"
+        run: >-
+          sudo ansible-playbook
+          -i inventory
+          --connection local
+          hms-docker.yml
+          --diff
+          --extra-vars "
+          is_github_runner=yes
+          "