From 48ed5a92bae766e1cf611fc8e4841e3900e4effd Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Fri, 17 Nov 2023 11:07:25 -0500
Subject: [PATCH] testing modularity

---
 .drone.yml | 67 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 24 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 5d9da74..0f5501e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,19 +5,22 @@ type: docker
 
 
 steps:
-  - name: Ansible Playbook Lint and Test
+  - name: Verify environment
     image: gitea.thezengarden.net/podman/images/ansible-dev:latest
-    environment:
-      GITEA_TOKEN:
-        from_secret: gitea_token
-      ANSIBLE_INVENTORY:
-        from_secret: ansible_inventory
     commands:
-      # - ansible-galaxy install -r $DRONE_WORKSPACE/requirements.yml
-      - ansible-lint --offline $DRONE_WORKSPACE
-      - ansible-playbook -v -i $ANSIBLE_INVENTORY $DRONE_WORKSPACE/hello.yml
-      - echo "Build complete and successful for $DRONE_REPO_NAME"
+      - hostname
       - whoami
+      - cd ${DRONE_WORKSPACE} && git log -1
+      - ansible --version
+      - ansible-lint --version
+    when:
+      branch:
+        - development
+      event:
+        - push
+
+  - name: Ansible-Galaxy - Install from requirements.yml
+      - ansible-galaxy install -r $DRONE_WORKSPACE/requirements.yml
     when:
       branch:
         - development
@@ -25,23 +28,39 @@ steps:
         - push
 
 
-  - name: Update repo with build stats
-    image: appleboy/drone-git-push
-    settings:
-      branch: testing
-      remote: gitea@10.10.10.109:chris/drone-test-1.git
-      force: false
-      commit: true
-      empty_commit: true
-      commit_message: "Drone build ${DRONE_COMMIT_SHA:0:7}"
-      author_name: "Drone CI"
-      author_email: "chris@thezengarden.net"
-      skip_verify: true
-      ssh_key:
-        from_secret: gitea_ssh_privkey
+  - name: Syntax check / Linting
+    image: gitea.thezengarden.net/podman/images/ansible-dev:latest
+    environment:
+      ANSIBLE_INVENTORY:
+        from_secret: ansible_inventory
+    commands:
+      - ansible-lint --offline $DRONE_WORKSPACE
+      - ansible-playbook -v -i 127.0.0.1, --connection=local $DRONE_WORKSPACE/hello.yml
+      - echo "Build complete and successful for $DRONE_REPO_NAME"
     when:
       branch:
         - development
+      event:
+        - push
+
+
+  # - name: Update repo with build stats
+  #   image: appleboy/drone-git-push
+  #   settings:
+  #     branch: testing
+  #     remote: gitea@10.10.10.109:chris/drone-test-1.git
+  #     force: false
+  #     commit: true
+  #     empty_commit: true
+  #     commit_message: "Drone build ${DRONE_COMMIT_SHA:0:7} => ${DRONE_BUILD_STATUS}"
+  #     author_name: "Drone CI"
+  #     author_email: "chris@thezengarden.net"
+  #     skip_verify: true
+  #     ssh_key:
+  #       from_secret: gitea_ssh_privkey
+  #   when:
+  #     branch:
+  #       - development
 
 
 # ---