From 949ed07b6c2d38e4a414bf6aa348bb8578148e17 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 11 Dec 2024 20:11:53 -0500 Subject: [PATCH 1/7] disable drone via file re-name --- .drone.yml => .drone.yml.bak | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .drone.yml => .drone.yml.bak (100%) diff --git a/.drone.yml b/.drone.yml.bak similarity index 100% rename from .drone.yml rename to .drone.yml.bak From 749eab45e6144ae9401336750e57123ff48ffbf8 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Tue, 17 Dec 2024 17:50:31 -0500 Subject: [PATCH 2/7] Testing Ansible CI w/Actions --- .gitea/workflows/ansible-test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/ansible-test.yml b/.gitea/workflows/ansible-test.yml index a525dac..de14bd4 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-debian11, ansible-dev-debian12 ] + os: [ ansible-dev-centos9, ansible-dev-fedora39, ansible-dev-debian12 ] runs-on: ${{ matrix.os }} steps: - name: Clone repository @@ -17,6 +17,7 @@ jobs: - name: Ansible Environment Verify run: | + whoami . ./.drone.env env git log -1 From 70f38985576e448e5ef4980851d204131b54d9c3 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Tue, 17 Dec 2024 17:56:22 -0500 Subject: [PATCH 3/7] Testing Ansible CI w/Actions 2 --- .drone.env | 1 - ansible.cfg | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.env b/.drone.env index cb9f953..3e0aeac 100644 --- a/.drone.env +++ b/.drone.env @@ -1,4 +1,3 @@ -# export ANSIBLE_LINT_EXCLUSION="--exclude collections/ansible_collections/ansible* --exclude collections/ansible_collections/community* --exclude .gitea" export ANSIBLE_LINT_EXCLUSION="--exclude collections/ansible_collections --exclude .gitea" export ANSIBLE_INVENTORY="-i 127.0.0.1, --connection=local" export ANSIBLE_PLAYBOOK="baseos.yml" diff --git a/ansible.cfg b/ansible.cfg index d58a63d..8f69f42 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -14,6 +14,7 @@ timeout = 30 host_key_checking = false display_skipped_hosts = false deprecation_warnings = false +force_color = true # callback_whitelist is deprecated # we only include here for backwards compatibility From 30c5c621c2fc9ad7b539444993f0d50758b94317 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Tue, 17 Dec 2024 22:14:16 -0500 Subject: [PATCH 4/7] Tweaks to workflow; Actions test --- .drone.env => .ci.env | 0 .gitea/workflows/ansible-test.yml | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename .drone.env => .ci.env (100%) diff --git a/.drone.env b/.ci.env similarity index 100% rename from .drone.env rename to .ci.env diff --git a/.gitea/workflows/ansible-test.yml b/.gitea/workflows/ansible-test.yml index de14bd4..91c1570 100644 --- a/.gitea/workflows/ansible-test.yml +++ b/.gitea/workflows/ansible-test.yml @@ -18,7 +18,7 @@ jobs: - name: Ansible Environment Verify run: | whoami - . ./.drone.env + . ./.ci.env env git log -1 ansible --version @@ -30,10 +30,10 @@ jobs: - name: Run Ansible-Lint run: | - . ./.drone.env + . ./.ci.env ansible-lint --offline $ANSIBLE_LINT_EXCLUSION - name: Run Ansible-Playbook run: | - . ./.drone.env + . ./.ci.env ansible-playbook -v $ANSIBLE_INVENTORY $ANSIBLE_PLAYBOOK From 60b891aae4e66727b90d1b41cf6de45c7800178e Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Thu, 21 Aug 2025 02:11:31 -0400 Subject: [PATCH 5/7] 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}" From 6d540828e0b6636118b05fb7bf92022e0015348d Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Thu, 21 Aug 2025 11:47:44 -0400 Subject: [PATCH 6/7] Collection version bump to pull in fixes --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 5c6dc7f..6ec3aa3 100644 --- a/requirements.yml +++ b/requirements.yml @@ -4,7 +4,7 @@ collections: - name: jchristianh.baseos source: https://gitea.thezengarden.net/ansible_collections/ansible-collection-baseos.git type: git - version: 1.0.34 + version: 1.0.35 # Galaxy Collections - name: community.general From b6f277da584b29fb0b506f88b569a4c764b4794d Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Mon, 25 Aug 2025 13:30:32 -0400 Subject: [PATCH 7/7] Collection version bump --- .gitea/workflows/ansible-test.yml | 5 +---- requirements.yml | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/ansible-test.yml b/.gitea/workflows/ansible-test.yml index b49f02c..f26001e 100644 --- a/.gitea/workflows/ansible-test.yml +++ b/.gitea/workflows/ansible-test.yml @@ -7,10 +7,7 @@ on: jobs: Ansible-Development-Pipeline: - strategy: - matrix: - os: [ ansible-dev-centos, ansible-dev-fedora, ansible-dev-debian ] - runs-on: ${{ matrix.os }} + runs-on: ansible-dev-centos steps: - name: Clone repository uses: actions/checkout@v3 diff --git a/requirements.yml b/requirements.yml index 6ec3aa3..ba21362 100644 --- a/requirements.yml +++ b/requirements.yml @@ -4,7 +4,7 @@ collections: - name: jchristianh.baseos source: https://gitea.thezengarden.net/ansible_collections/ansible-collection-baseos.git type: git - version: 1.0.35 + version: 1.0.36 # Galaxy Collections - name: community.general