Upgrade ansible-core/ansible-lint to latest versions for Fedora/Debian; README.md updates (#33)

Reviewed-on: #33

.drone.yml.bak

@@ -1,379 +0,0 @@
----
-##########################
-# CENTOS STREAM 9: TESTING
-##########################
-kind: pipeline
-type: exec
-name: ansible_dev_centos_stream9-test
-
-
-trigger:
-  branch:
-    - testing
-  event: [push]
-  status: [success]
-
-
-steps:
-  - name: check_environment
-    commands:
-      - hostnamectl
-      - env
-      - whoami
-      - pwd
-      - tree
-
-  - name: docker_info
-    commands:
-      - docker info
-
-  - 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 $GITEA_USER --password-stdin $REGISTRY
-
-  - name: docker_build_and_push
-    environment:
-      REGISTRY       :
-        from_secret: build_registry
-      BUILD_PREFIX   :
-        from_secret: build_prefix
-      BUILD_NAME     :
-        from_secret: build_name_centos9
-    commands:
-      - echo "docker build --no-cache -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ."
-      - docker build --no-cache -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER .
-      - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER
-      - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
-
-
-
----
-##########################
-# CENTOS STREAM 9: RELEASE
-##########################
-kind: pipeline
-type: exec
-name: ansible_dev_centos_stream9-rel
-
-
-trigger:
-  branch:
-    - release
-  event: [push]
-  status: [success]
-
-
-steps:
-  - 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 $GITEA_USER --password-stdin $REGISTRY
-
-  - name: docker_build_and_push
-    environment:
-      REGISTRY       :
-        from_secret: build_registry
-      BUILD_PREFIX   :
-        from_secret: build_prefix
-      BUILD_NAME     :
-        from_secret: build_name_centos9
-    commands:
-      - docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH .
-      - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH
-      - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
-
-
----
-####################
-# FEDORA 39: TESTING
-####################
-kind: pipeline
-type: exec
-name: ansible_dev_fedora39-test
-
-
-trigger:
-  branch:
-    - testing
-  event: [push]
-  status: [success]
-
-
-steps:
-  - name: check_environment
-    commands:
-      - hostnamectl
-      - env
-      - whoami
-      - pwd
-      - tree
-
-  - name: docker_info
-    commands:
-      - docker info
-
-  - 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 $GITEA_USER --password-stdin $REGISTRY
-
-  - name: docker_build_and_push
-    environment:
-      REGISTRY       :
-        from_secret: build_registry
-      BUILD_PREFIX   :
-        from_secret: build_prefix
-      BUILD_NAME     :
-        from_secret: build_name_fedora39
-    commands:
-      - echo "docker build --no-cache -f build/Containerfile.fedora39 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ."
-      - docker build --no-cache -f build/Containerfile.fedora39 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER .
-      - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER
-      - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
-
-
----
-####################
-# FEDORA 39: RELEASE
-####################
-kind: pipeline
-type: exec
-name: ansible_dev_fedora39-rel
-
-
-trigger:
-  branch:
-    - release
-  event: [push]
-  status: [success]
-
-
-steps:
-  - 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 $GITEA_USER --password-stdin $REGISTRY
-
-  - name: docker_build_and_push
-    environment:
-      REGISTRY       :
-        from_secret: build_registry
-      BUILD_PREFIX   :
-        from_secret: build_prefix
-      BUILD_NAME     :
-        from_secret: build_name_fedora39
-    commands:
-      - docker build -f build/Containerfile.fedora39 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH .
-      - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH
-      - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
-
-
----
-####################
-# DEBIAN 11: TESTING
-####################
-kind: pipeline
-type: exec
-name: ansible_dev_debian11-test
-
-
-trigger:
-  branch:
-    - testing
-  event: [push]
-  status: [success]
-
-
-steps:
-  - name: check_environment
-    commands:
-      - hostnamectl
-      - env
-      - whoami
-      - pwd
-      - tree
-
-  - name: docker_info
-    commands:
-      - docker info
-
-  - 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 $GITEA_USER --password-stdin $REGISTRY
-
-  - name: docker_build_and_push
-    environment:
-      REGISTRY       :
-        from_secret: build_registry
-      BUILD_PREFIX   :
-        from_secret: build_prefix
-      BUILD_NAME     :
-        from_secret: build_name_debian11
-    commands:
-      - echo "docker build --no-cache -f build/Containerfile.debian11 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ."
-      - docker build --no-cache -f build/Containerfile.debian11 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER .
-      - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER
-      - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
-
-
----
-####################
-# DEBIAN 11: RELEASE
-####################
-kind: pipeline
-type: exec
-name: ansible_dev_debian11-rel
-
-
-trigger:
-  branch:
-    - release
-  event: [push]
-  status: [success]
-
-
-steps:
-  - 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 $GITEA_USER --password-stdin $REGISTRY
-
-  - name: docker_build_and_push
-    environment:
-      REGISTRY       :
-        from_secret: build_registry
-      BUILD_PREFIX   :
-        from_secret: build_prefix
-      BUILD_NAME     :
-        from_secret: build_name_debian11
-    commands:
-      - docker build -f build/Containerfile.debian11 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH .
-      - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH
-      - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
-
-
----
-####################
-# DEBIAN 12: TESTING
-####################
-kind: pipeline
-type: exec
-name: ansible_dev_debian12-test
-
-
-trigger:
-  branch:
-    - testing
-  event: [push]
-  status: [success]
-
-
-steps:
-  - name: check_environment
-    commands:
-      - hostnamectl
-      - env
-      - whoami
-      - pwd
-      - tree
-
-  - name: docker_info
-    commands:
-      - docker info
-
-  - 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 $GITEA_USER --password-stdin $REGISTRY
-
-  - name: docker_build_and_push
-    environment:
-      REGISTRY       :
-        from_secret: build_registry
-      BUILD_PREFIX   :
-        from_secret: build_prefix
-      BUILD_NAME     :
-        from_secret: build_name_debian12
-    commands:
-      - echo "docker build --no-cache -f build/Containerfile.debian12 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ."
-      - docker build --no-cache -f build/Containerfile.debian12 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER .
-      - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER
-      - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
-
-
----
-####################
-# DEBIAN 12: RELEASE
-####################
-kind: pipeline
-type: exec
-name: ansible_dev_debian12-rel
-
-
-trigger:
-  branch:
-    - release
-  event: [push]
-  status: [success]
-
-
-steps:
-  - 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 $GITEA_USER --password-stdin $REGISTRY
-
-  - name: docker_build_and_push
-    environment:
-      REGISTRY       :
-        from_secret: build_registry
-      BUILD_PREFIX   :
-        from_secret: build_prefix
-      BUILD_NAME     :
-        from_secret: build_name_debian12
-    commands:
-      - docker build -f build/Containerfile.debian12 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH .
-      - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH
-      - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"

.gitea/workflows/build-release.yml

@@ -13,12 +13,12 @@ jobs:
         working-directory: /home/builds/src/ansible-dev
 
     steps:
-      - name: "Checkout branch: ${{ env.GITHUB_REF_NAME }}"
+      - name: "Checkout Branch: ${{ env.GITHUB_REF_NAME }}"
         run: |
           git fetch origin ${{ env.GITHUB_REF_NAME }}:${{ env.GITHUB_REF_NAME }}
           git checkout ${{ env.GITHUB_REF_NAME }}
 
-      - name: Verify current commit
+      - name: Verify Current Commit
         run: git log -1
 
 
@@ -30,6 +30,11 @@ jobs:
         working-directory: /home/builds/src/ansible-dev
 
     steps:
+      - name: CentOS
+        run: |
+          echo "docker build -f build/Containerfile.centos -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }} ."
+          docker build -f build/Containerfile.centos -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }} .
+
       - name: Fedora
         run: |
           echo "docker build -f build/Containerfile.fedora -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} ."
@@ -45,12 +50,13 @@ jobs:
     runs-on: self-hosted
     needs: [Build-Images]
     steps:
-      - name: Docker login
+      - name: Docker Login
         run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login --username ${{ secrets.REGISTRY_USER }} --password-stdin ${{ vars.REGISTRY }}
 
-      - name: Push images to registry
+      - name: Push Images to Registry
         run: |
           pwd
+          docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}
           docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}
           docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}
 
@@ -59,9 +65,10 @@ jobs:
     runs-on: self-hosted
     needs: [Build-Images, Push-Images]
     steps:
-      - name: Cleanup build images
+      - name: Cleanup Build Images
         run: |
           pwd
+          docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}
           docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}
           docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}
 

.gitea/workflows/build-test.yml

@@ -6,29 +6,29 @@ on:
       - testing
 
 jobs:
-  Cleanup-Old-Artifacts:
+  Clean-Stale-Artifacts:
     runs-on: self-hosted
     defaults:
       run:
         working-directory: /home/builds/src
 
     steps:
-      - name: Cleanup old code
+      - name: Cleanup Stale Artifacts
         run: rm -rfv *
 
-      - name: Cleanup old build cache
+      - name: Cleanup Build Cache
         run: docker system prune -af
 
 
   Check-Environment:
     runs-on: self-hosted
-    needs: [Cleanup-Old-Artifacts]
+    needs: [Clean-Stale-Artifacts]
     defaults:
       run:
         working-directory: /home/builds/src
 
     steps:
-      - name: Environment check
+      - name: Environment Check
         run: |
           echo "BUILD_USER: $(whoami)" && echo
           echo "PWD: $(pwd)" && echo
@@ -46,13 +46,13 @@ jobs:
         working-directory: /home/builds/src
 
     steps:
-      - name: Clone repository
+      - name: Clone Repository
         run: |
           git clone https://gitea.thezengarden.net/podman/ansible-dev.git
           cd ansible-dev
           git checkout ${{ env.GITHUB_REF_NAME }}
 
-      - name: Verify current commit
+      - name: Verify Current Commit
         run: cd ansible-dev && git log -1
 
 
@@ -64,6 +64,11 @@ jobs:
         working-directory: /home/builds/src/ansible-dev
 
     steps:
+      - name: CentOS
+        run: |
+          echo "docker build --no-cache -f build/Containerfile.centos -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }} ."
+          docker build --no-cache -f build/Containerfile.centos -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }} .
+
       - name: Fedora
         run: |
           echo "docker build --no-cache -f build/Containerfile.fedora -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} ."
@@ -79,12 +84,13 @@ jobs:
     runs-on: self-hosted
     needs: [Build-Images]
     steps:
-      - name: Docker login
+      - name: Docker Login
         run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login --username ${{ secrets.REGISTRY_USER }} --password-stdin ${{ vars.REGISTRY }}
 
-      - name: Push images to registry
+      - name: Push Images to Registry
         run: |
           pwd
+          docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}
           docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}
           docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}
 
@@ -93,9 +99,10 @@ jobs:
     runs-on: self-hosted
     needs: [Build-Images, Push-Images]
     steps:
-      - name: Cleanup build images
+      - name: Cleanup Build Images
         run: |
           pwd
+          docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}
           docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}
           docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}
 
@@ -104,5 +111,5 @@ jobs:
     runs-on: self-hosted
     needs: [Push-Images]
     steps:
-      - name: Cleanup Docker login
+      - name: Cleanup Docker Login
         run: rm -v /home/builds/.docker/config.json

README.md

@@ -0,0 +1,13 @@
+## Build Status:
+### Testing:
+![Build status](https://gitea.thezengarden.net/podman/ansible-dev/actions/workflows/build-test.yml/badge.svg?branch=testing&style=flat)
+
+### Release:
+![Build status](https://gitea.thezengarden.net/podman/ansible-dev/actions/workflows/build-release.yml/badge.svg?branch=release&style=flat)
+
+---
+<br>
+
+> Container images and supporting build files for Ansible development
+>
+> Supports: CentOS Stream (9), Fedora (41), Debian (12)

build/Containerfile.centos

@@ -8,7 +8,7 @@ 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
+COPY python/requirements-centos.txt /tmp/requirements.txt
 
 # RUN dnf install -y python3-pip git ansible-core python3-ansible-lint
 RUN dnf update -y \
@@ -18,4 +18,5 @@ RUN dnf update -y \
 
 COPY ansible/ansible-check.yml /tmp/ansible-check.yml
 
+WORKDIR /root
 CMD ["/bin/bash"]

build/Containerfile.debian

@@ -18,4 +18,5 @@ RUN apt update \
 
 COPY ansible/ansible-check.yml /tmp/ansible-check.yml
 
+WORKDIR /root
 CMD ["/bin/bash"]

build/Containerfile.fedora

@@ -12,10 +12,11 @@ COPY python/requirements.txt /tmp/requirements.txt
 
 # RUN dnf install -y python3-pip git ansible-core python3-ansible-lint
 RUN dnf update -y \
-    && dnf install -y python3-pip python3-devel gcc git systemd nodejs tree procps-ng \
+    && dnf install -y python3-pip python3-devel gcc git systemd nodejs tree procps-ng python3-libdnf5 \
     && pip install pip --upgrade \
     && pip install -r /tmp/requirements.txt
 
 COPY ansible/ansible-check.yml /tmp/ansible-check.yml
 
+WORKDIR /root
 CMD ["/bin/bash"]

python/requirements-centos.txt

@@ -0,0 +1,2 @@
+ansible-core==2.14.18
+ansible-lint==6.22.2

python/requirements.txt

@@ -1,2 +1,2 @@
-ansible-core==2.16.14
+ansible-core==2.19.0
-ansible-lint==24.12.2
+ansible-lint==25.8.1

scripts/build_images.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+podman build -f build/Containerfile.centos -t local/ansible-dev-centos:latest .
+podman build -f build/Containerfile.centos -t local/ansible-dev-debian:latest .
+podman build -f build/Containerfile.fedora -t local/ansible-dev-fedora:latest .