Merge pull request 're-add community.general' (#14) from development into main

Reviewed-on: #14

.ansible-lint

@@ -1,2 +1,7 @@
 skip_list:
   - yaml[line-length]
+  - yaml[colons]
+
+exclude_paths:
+  - .drone.yml
+  - requirements.yml

.drone.yml

@@ -1,46 +1,90 @@
 ---
-name: Ansible Playbook Lint and Test Execution
+global-variables:
+  ansible_image: &ansible_image         "gitea.thezengarden.net/podman/images/ansible-dev:latest"
+  ansible_inventory: &ansible_inventory "-i 127.0.0.1, --connection=local"
+  ansible_playbook: &ansible_playbook   "hello.yml"
+
+
+name: run_ansible_tests
 kind: pipeline
 type: docker
 
 
+environment:
+  ANSIBLE_INVENTORY    : *ansible_inventory
+  ANSIBLE_PLAYBOOK     : *ansible_playbook
+  ANSIBLE_DOCKER_IMAGE : *ansible_image
+
+
 steps:
-  - name: Install requirements, lint, and run Ansible playbook
-    image: gitea.thezengarden.net/podman/images/ansible-dev:latest
-    environment:
-      GITEA_TOKEN:
-        from_secret: gitea_token
-      ANSIBLE_INVENTORY:
-        from_secret: ansible_inventory
+  - name: "ansible_environment_verify"
+    image: *ansible_image
     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"
+      - git log -1
+      - ansible --version
+      - ansible-lint --version
     when:
       branch:
-        - development
-      event:
-        include:
-          - push
         exclude:
-          - pull_request
+          - main
+      event: [push]
 
 
-  - name: push commit
-    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: "ansible_galaxy_requirements"
+    image: *ansible_image
+    commands:
+      - ansible-galaxy install -r requirements.yml
+    when:
+      branch:
+        exclude:
+          - main
+      event: [push]
+
+
+  - name: "ansible_lint"
+    image: *ansible_image
+    commands:
+      - ansible-lint --offline
+    when:
+      branch:
+        exclude:
+          - main
+      event: [push]
+
+
+  - name: "ansible_playbook_execution"
+    image: *ansible_image
+    commands:
+      - ansible-playbook -v $ANSIBLE_INVENTORY $ANSIBLE_PLAYBOOK
+    when:
+      branch:
+        exclude:
+          - main
+      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
 
 
 # ---

.drone.yml.test1

@@ -1,30 +0,0 @@
----
-name: Ansible Linting of drone-test-1
-kind: pipeline
-type: docker
-
-steps:
-  - name: "Ansible Testing: Install required packages and Python modules"
-    image: quay.io/centos/centos:stream9
-    commands:
-      - dnf update -y
-      - dnf install -y python3-pip git hostname
-      - pip3 install ansible-core==2.14.11 ansible-lint==6.13.1
-
-
-  - name: "Ansible Testing: Make repo directory and clone desired repository"
-    image: quay.io/centos/centos:stream9
-    commands:
-      - mkdir /opt/test
-      - git clone https://gitea.thezengarden.net/chris/drone-test-1.git /opt/test/drone-test-1
-    depends_on:
-      - "Ansible Testing: Install required packages and Python modules"
-
-
-  - name: "Ansible Testing: Run Ansible-Lint and Ansible-Playbook against cloned repo"
-    image: quay.io/centos/centos:stream9
-    commands:
-      - ansible-lint /opt/test/drone-test-1
-      - ansible-playbook -v -i 127.0.0.1, /opt/test/drone-test-1/hello.yml
-    depends_on:
-      - "Ansible Testing: Make repo directory and clone desired repository"

hello.yml

@@ -1,10 +1,16 @@
 - name: Hello world
-  hosts: localhost
-  connection: local
+  hosts: all
   become: false
   gather_facts: false
 
+
   tasks:
     - name: Say Hello world
       ansible.builtin.debug:
         msg: Hello world!
+
+
+    - name: Install Git
+      ansible.builtin.package:
+        name: git
+        state: present

old/drone-yml.centos8

@@ -1,21 +0,0 @@
----
-name: Ansible Linting of drone-test-1
-kind: pipeline
-type: docker
-
-steps:
-  - name: Prepare CentOS 8 image, clone, and test code
-    image: centos:8
-    commands:
-      - hostname
-      - lscpu
-      - dnf --disablerepo '*' --enablerepo=extras swap centos-linux-repos centos-stream-repos -y
-      - dnf distro-sync -y
-      - dnf update -y
-      - hostname
-      - dnf install -y ansible-core git
-      - pip3 install ansible-lint
-      - mkdir /opt/test
-      - git clone https://gitea.thezengarden.net/chris/drone-test-1.git /opt/test/drone-test-1
-      - ansible-lint /opt/test/drone-test-1
-

requirements.yml

@@ -1,5 +1,3 @@
 collections:
-  - community.general
-  - ansible.netcommon
-  - community.docker
-  - containers.podman
+  - name: ansible.posix
+  - name: community.general