From 60b891aae4e66727b90d1b41cf6de45c7800178e Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Thu, 21 Aug 2025 02:11:31 -0400
Subject: [PATCH] Cleanup; CI fixes

---
 .drone.yml.bak                    | 154 ------------------------------
 .gitea/workflows/ansible-test.yml |   2 +-
 testing/env-test.sh               |   2 +-
 3 files changed, 2 insertions(+), 156 deletions(-)
 delete mode 100644 .drone.yml.bak

diff --git a/.drone.yml.bak b/.drone.yml.bak
deleted file mode 100644
index ad4e45d..0000000
--- a/.drone.yml.bak
+++ /dev/null
@@ -1,154 +0,0 @@
----
-kind: pipeline
-type: docker
-name: CentOS_9-Ansible-Pipeline
-
-trigger:
-  branch:
-    exclude:
-      - main
-  event: [push]
-
-steps:
-  - name: ansible_environment_verify
-    image: gitea.thezengarden.net/podman/ansible-dev/centos9:release
-    commands:
-      - . ./.drone.env
-      - env
-      - git log -1
-      - ansible --version
-      - ansible-lint --version
-
-  - name: ansible_galaxy_requirements
-    image: gitea.thezengarden.net/podman/ansible-dev/centos9:release
-    commands:
-      - ansible-galaxy install -r requirements.yml
-
-  - name: ansible_lint
-    image: gitea.thezengarden.net/podman/ansible-dev/centos9:release
-    commands:
-      - . ./.drone.env
-      - ansible-lint --offline $ANSIBLE_LINT_EXCLUSION
-
-  - name: ansible_playbook_execution
-    image: gitea.thezengarden.net/podman/ansible-dev/centos9:release
-    commands:
-      - . ./.drone.env
-      - ansible-playbook -v $ANSIBLE_INVENTORY $ANSIBLE_PLAYBOOK
-
-
----
-kind: pipeline
-type: docker
-name: Fedora_39-Ansible-Pipeline
-
-trigger:
-  branch:
-    exclude:
-      - main
-  event: [push]
-
-steps:
-  - name: ansible_environment_verify
-    image: gitea.thezengarden.net/podman/ansible-dev/fedora39:release
-    commands:
-      - . ./.drone.env
-      - env
-      - git log -1
-      - ansible --version
-      - ansible-lint --version
-
-  - name: ansible_galaxy_requirements
-    image: gitea.thezengarden.net/podman/ansible-dev/fedora39:release
-    commands:
-      - ansible-galaxy install -r requirements.yml
-
-  - name: ansible_lint
-    image: gitea.thezengarden.net/podman/ansible-dev/fedora39:release
-    commands:
-      - . ./.drone.env
-      - ansible-lint --offline $ANSIBLE_LINT_EXCLUSION
-
-  - name: ansible_playbook_execution
-    image: gitea.thezengarden.net/podman/ansible-dev/fedora39:release
-    commands:
-      - . ./.drone.env
-      - ansible-playbook -v $ANSIBLE_INVENTORY $ANSIBLE_PLAYBOOK
-
-
----
-kind: pipeline
-type: docker
-name: Debian_11-Ansible-Pipeline
-
-trigger:
-  branch:
-    exclude:
-      - main
-  event: [push]
-
-steps:
-  - name: ansible_environment_verify
-    image: gitea.thezengarden.net/podman/ansible-dev/debian11:release
-    commands:
-      - . ./.drone.env
-      - env
-      - git log -1
-      - ansible --version
-      - ansible-lint --version
-
-  - name: ansible_galaxy_requirements
-    image: gitea.thezengarden.net/podman/ansible-dev/debian11:release
-    commands:
-      - ansible-galaxy install -r requirements.yml
-
-  - name: ansible_lint
-    image: gitea.thezengarden.net/podman/ansible-dev/debian11:release
-    commands:
-      - . ./.drone.env
-      - ansible-lint --offline $ANSIBLE_LINT_EXCLUSION
-
-  - name: ansible_playbook_execution
-    image: gitea.thezengarden.net/podman/ansible-dev/debian11:release
-    commands:
-      - . ./.drone.env
-      - ansible-playbook -v $ANSIBLE_INVENTORY $ANSIBLE_PLAYBOOK
-
-
----
-kind: pipeline
-type: docker
-name: Debian_12-Ansible-Pipeline
-
-trigger:
-  branch:
-    exclude:
-      - main
-  event: [push]
-
-steps:
-  - name: ansible_environment_verify
-    image: gitea.thezengarden.net/podman/ansible-dev/debian12:release
-    commands:
-      - . ./.drone.env
-      - env
-      - git log -1
-      - ansible --version
-      - ansible-lint --version
-
-  - name: ansible_galaxy_requirements
-    image: gitea.thezengarden.net/podman/ansible-dev/debian12:release
-    commands:
-      - ansible-galaxy install -r requirements.yml
-
-  - name: ansible_lint
-    image: gitea.thezengarden.net/podman/ansible-dev/debian12:release
-    commands:
-      - . ./.drone.env
-      - ansible-lint --offline $ANSIBLE_LINT_EXCLUSION
-
-  - name: ansible_playbook_execution
-    image: gitea.thezengarden.net/podman/ansible-dev/debian12:release
-    commands:
-      - . ./.drone.env
-      - ansible-playbook -v $ANSIBLE_INVENTORY $ANSIBLE_PLAYBOOK
diff --git a/.gitea/workflows/ansible-test.yml b/.gitea/workflows/ansible-test.yml
index 91c1570..b49f02c 100644
--- a/.gitea/workflows/ansible-test.yml
+++ b/.gitea/workflows/ansible-test.yml
@@ -9,7 +9,7 @@ jobs:
   Ansible-Development-Pipeline:
     strategy:
       matrix:
-        os: [ ansible-dev-centos9, ansible-dev-fedora39, ansible-dev-debian12 ]
+        os: [ ansible-dev-centos, ansible-dev-fedora, ansible-dev-debian ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Clone repository
diff --git a/testing/env-test.sh b/testing/env-test.sh
index e5edb50..7ddcbb5 100755
--- a/testing/env-test.sh
+++ b/testing/env-test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "Which environment to test? (centos9, fedora39, debian11, debian12)"
+echo "Which environment to test? (centos, fedora, debian)"
 read test_environment
 
 CNAME="testing-${test_environment}"