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

Reviewed-on: #14

.drone.yml

@@ -1,22 +1,20 @@
 ---
+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
-name: run_ansible_tests_fedora39
 
-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"
 
 environment:
   ANSIBLE_INVENTORY    : *ansible_inventory
   ANSIBLE_PLAYBOOK     : *ansible_playbook
+  ANSIBLE_DOCKER_IMAGE : *ansible_image
 
-trigger:
-  branch:
-    exclude:
-      - main
-  event: [push]
 
 steps:
   - name: "ansible_environment_verify"
@@ -25,202 +23,85 @@ steps:
       - git log -1
       - ansible --version
       - ansible-lint --version
+    when:
+      branch:
+        exclude:
+          - main
+      event: [push]
+
 
   - 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]
 
 
----
-kind: pipeline
-type: docker
-name: run_ansible_tests_centos9
-
-global-variables:
-  ansible_image     : &ansible_image     "gitea.thezengarden.net/podman/images/ansible-dev:centos-stream9"
-  ansible_inventory : &ansible_inventory "-i 127.0.0.1, --connection=local"
-  ansible_playbook  : &ansible_playbook  "hello.yml"
-
-environment:
-  ANSIBLE_INVENTORY    : *ansible_inventory
-  ANSIBLE_PLAYBOOK     : *ansible_playbook
-
-trigger:
-  branch:
-    exclude:
-      - main
-  event: [push]
-
-steps:
-  - name: "ansible_environment_verify"
-    image: *ansible_image
-    commands:
-      - git log -1
-      - ansible --version
-      - ansible-lint --version
-
-  - name: "ansible_galaxy_requirements"
-    image: *ansible_image
-    commands:
-      - ansible-galaxy install -r requirements.yml
-
-  - name: "ansible_lint"
-    image: *ansible_image
-    commands:
-      - ansible-lint --offline
-
-  - name: "ansible_playbook_execution"
-    image: *ansible_image
-    commands:
-      - ansible-playbook -v $ANSIBLE_INVENTORY $ANSIBLE_PLAYBOOK
+###############################################################################
+###############################################################################
+###############################################################################
 
 
----
-kind: pipeline
-type: docker
-name: run_ansible_tests_debian12
-
-global-variables:
-  ansible_image     : &ansible_image     "gitea.thezengarden.net/podman/images/ansible-dev:debian-12"
-  ansible_inventory : &ansible_inventory "-i 127.0.0.1, --connection=local"
-  ansible_playbook  : &ansible_playbook  "hello.yml"
-
-environment:
-  ANSIBLE_INVENTORY    : *ansible_inventory
-  ANSIBLE_PLAYBOOK     : *ansible_playbook
-
-trigger:
-  branch:
-    exclude:
-      - main
-  event: [push]
-
-steps:
-  - name: "ansible_environment_verify"
-    image: *ansible_image
-    commands:
-      - git log -1
-      - ansible --version
-      - ansible-lint --version
-
-  - name: "ansible_galaxy_requirements"
-    image: *ansible_image
-    commands:
-      - ansible-galaxy install -r requirements.yml
-
-  - name: "ansible_lint"
-    image: *ansible_image
-    commands:
-      - ansible-lint --offline
-
-  - name: "ansible_playbook_execution"
-    image: *ansible_image
-    commands:
-      - ansible-playbook -v $ANSIBLE_INVENTORY $ANSIBLE_PLAYBOOK
+  # - 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
 
 
 # ---
+# name: Test Ansible Linting of drone-test-1
 # kind: pipeline
-# type: exec
-# name: check_docker
-
-# trigger:
-#   branch:
-#     exclude:
-#       - main
-#   event: [push]
-#   status: [success]
-
-# depends_on:
-#   - run_ansible_tests
+# type: docker
 
 # steps:
-#   - name: check_env
-#     commands:
-#       - whoami
-#       - hostnamectl
-#       - env
-#       - pwd
-#       - tree
-#       - cat requirements.yml
-
-#   - name: docker_info
-#     commands:
-#       - docker info
-
-#   - name: docker_build
+#   - name: Add comment to pull request
+#     image: gitea.thezengarden.net/podman/images/ansible-dev:latest
 #     environment:
-#       REGISTRY       : gitea.thezengarden.net
-#       BUILD_PREFIX   : "podman/images"
-#       BUILD_NAME     : ansible-dev
+#       GITEA_TOKEN:
+#         from_secret: gitea_token
 #     commands:
-#       - echo "docker build --no-cache -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_BUILD_NUMBER ."
-#       - docker build --no-cache -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_BUILD_NUMBER .
-
-#   - name: docker_login
-#     environment:
-#       REGISTRY       : gitea.thezengarden.net
-#       GITEA_USER     :
-#         from_secret: gitea_user
-#       GITEA_PASSWORD :
-#         from_secret: gitea_password
-#     commands:
-#       - echo "$GITEA_PASSWORD" | docker login --username chris --password-stdin $REGISTRY
-
-#   - name: docker_push
-#     environment:
-#       REGISTRY       : gitea.thezengarden.net
-#       BUILD_PREFIX   : "podman/images"
-#       BUILD_NAME     : ansible-dev
-#     commands:
-#       - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_BUILD_NUMBER
-#       - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
-
-#   - name: docker_images
-#     environment:
-#       REGISTRY       : gitea.thezengarden.net
-#       BUILD_PREFIX   : "podman/images"
-#       BUILD_NAME     : ansible-dev
-#     commands:
-#       - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
-
-
-# ---
-# kind: pipeline
-# type: exec
-# name: setup_env
-
-# trigger:
-#   branch:
-#     exclude:
-#       - main
-#   event: [push]
-
-# steps:
-#   - name: write_vars
-#     environment:
-#       DIMG:
-#         from_secret: docker_image
-#     commands:
-#       - pwd
-#       - ls -ltra
-#       - echo "dimg=$DIMG" > .drone_env_test
-
-#   - name: read_vars
-#     commands:
-#       - pwd
-#       - ls -ltra
-#       - cat .drone_env_test
-#       - source .drone_env_test
-#       - echo $dimg
+#       - 'curl -sL -X POST -H "Authorization: token $GITEA_TOKEN" -H "Content-type: application/json" https://gitea.thezengarden.net/api/v1/repos/${DRONE_REPO_OWNER}/${DRONE_REPO_NAME}/issues/${DRONE_PULL_REQUEST}/comments -d "{\"body\": \"Build complete and successful for $DRONE_REPO_NAME\"}"'
+#     depends_on:
+#       - "Install requirements, lint, and run Ansible playbook"
+#     when:
+#       event:
+#         - pull_request

.gitignore

@@ -1 +0,0 @@
-.old

Dockerfile

@@ -1,20 +0,0 @@
-FROM fedora:39
-LABEL maintainer="Chris Hammer (chris@thezengarden.net)"
-
-RUN rm /etc/localtime \
-    && ln -s /usr/share/zoneinfo/US/Eastern /etc/localtime
-
-RUN  mkdir -p /root/.ssh
-COPY conf/ssh_config /root/.ssh/config
-COPY conf/hosts /etc/hosts
-COPY conf/dnf.conf /etc/dnf/dnf.conf
-COPY python/requirements.txt /tmp/requirements.txt
-
-RUN dnf update -y
-RUN dnf install -y python3-pip git ansible-core python3-ansible-lint
-#    && pip install pip --upgrade \
-#    && pip install -r /tmp/requirements.txt
-
-COPY ansible/ansible-check.yml /tmp/ansible-check.yml
-
-CMD ["/bin/bash"]

ansible/ansible-check.yml

@@ -1,10 +0,0 @@
----
-- name: Ansible Install Test
-  hosts: all
-  become: false
-  gather_facts: false
-
-  tasks:
-    - name: Test Ansible Installation
-      ansible.builtin.debug:
-        msg: "Ansible has been successfully installed!"

conf/dnf.conf

@@ -1,7 +0,0 @@
-[main]
-gpgcheck=1
-installonly_limit=3
-clean_requirements_on_remove=True
-best=True
-skip_if_unavailable=False
-max_parallel_downloads=20

conf/hosts

@@ -1 +0,0 @@
-10.10.10.109 gitea.thezengarden.net

conf/ssh_config

@@ -1,14 +0,0 @@
-AddKeysToAgent yes
-
-Host 10.*
-   StrictHostKeyChecking no
-   UserKnownHostsFile=/dev/null
-
-Host git git.thezengarden.net
-  Hostname gitlab
-
-
-Host gitea gitea.thezengarden.net
-  Hostname 10.10.10.109
-
-

hello.yml

@@ -8,3 +8,9 @@
     - name: Say Hello world
       ansible.builtin.debug:
         msg: Hello world!
+
+
+    - name: Install Git
+      ansible.builtin.package:
+        name: git
+        state: present

python/requirements.txt

@@ -1,2 +0,0 @@
-ansible-core==2.14.11
-ansible-lint==6.13.1