From c71c2ce761111bad4f5139f14410edac9cbfb26a Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 01:04:09 -0500 Subject: [PATCH 01/26] add git push test --- .drone.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.drone.yml b/.drone.yml index 9d5fbce..608bdb6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -26,6 +26,21 @@ steps: exclude: - pull_request + + - name: push commit + image: appleboy/drone-git-push + settings: + branch: testing + remote: gitea@gitea.thezengarden.net:chris/drone-test-1.git + force: false + commit: true + commit_message: "Drone build ${DRONE_COMMIT_SHA:0:7}" + author_name: "Drone CI" + author_email: "chris@thezengarden.net" + ssh_key: + from_secret: gitea_ssh_privkey + + # --- # name: Test Ansible Linting of drone-test-1 # kind: pipeline -- 2.47.1 From 1f4974e1dd1a3f3f77430aa591a2c0fccac6be62 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 01:06:38 -0500 Subject: [PATCH 02/26] change from fqdn to ip addr --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 608bdb6..573b3e3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,7 +31,7 @@ steps: image: appleboy/drone-git-push settings: branch: testing - remote: gitea@gitea.thezengarden.net:chris/drone-test-1.git + remote: gitea@10.10.10.109:chris/drone-test-1.git force: false commit: true commit_message: "Drone build ${DRONE_COMMIT_SHA:0:7}" -- 2.47.1 From 93076731fefafd54a9cb49693e16f66dcb1e3513 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 09:12:16 -0500 Subject: [PATCH 03/26] remove git push for now --- .drone.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 573b3e3..40df752 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,18 +27,18 @@ steps: - pull_request - - 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 - commit_message: "Drone build ${DRONE_COMMIT_SHA:0:7}" - author_name: "Drone CI" - author_email: "chris@thezengarden.net" - ssh_key: - from_secret: gitea_ssh_privkey + # - 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 + # commit_message: "Drone build ${DRONE_COMMIT_SHA:0:7}" + # author_name: "Drone CI" + # author_email: "chris@thezengarden.net" + # ssh_key: + # from_secret: gitea_ssh_privkey # --- -- 2.47.1 From da407eddee702d2cc96244df82974cc77a06d862 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 09:50:35 -0500 Subject: [PATCH 04/26] updated image to include .ssh/config; re-add push commit test --- .drone.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 40df752..608bdb6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,18 +27,18 @@ steps: - pull_request - # - 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 - # commit_message: "Drone build ${DRONE_COMMIT_SHA:0:7}" - # author_name: "Drone CI" - # author_email: "chris@thezengarden.net" - # ssh_key: - # from_secret: gitea_ssh_privkey + - name: push commit + image: appleboy/drone-git-push + settings: + branch: testing + remote: gitea@gitea.thezengarden.net:chris/drone-test-1.git + force: false + commit: true + commit_message: "Drone build ${DRONE_COMMIT_SHA:0:7}" + author_name: "Drone CI" + author_email: "chris@thezengarden.net" + ssh_key: + from_secret: gitea_ssh_privkey # --- -- 2.47.1 From fd4b03d2f98233c85664f72aecb995ec25f92484 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 09:52:40 -0500 Subject: [PATCH 05/26] add whoami to verify what user we are --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 608bdb6..9160e66 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,10 +13,11 @@ steps: ANSIBLE_INVENTORY: from_secret: ansible_inventory commands: - - ansible-galaxy install -r $DRONE_WORKSPACE/requirements.yml + # - 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" + - whoami when: branch: - development -- 2.47.1 From cc9f96b470d95390cf8598899228bd602c5d8686 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 10:10:37 -0500 Subject: [PATCH 06/26] add ssh dir check --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 9160e66..680d39e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,6 +18,7 @@ steps: - ansible-playbook -v -i $ANSIBLE_INVENTORY $DRONE_WORKSPACE/hello.yml - echo "Build complete and successful for $DRONE_REPO_NAME" - whoami + - ls -ltr /root/.ssh when: branch: - development -- 2.47.1 From 5b144c5e884838b8d97fe8e016053a8021ae0eb9 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 10:29:23 -0500 Subject: [PATCH 07/26] add skip_verify --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 680d39e..ff41175 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,12 +33,13 @@ steps: image: appleboy/drone-git-push settings: branch: testing - remote: gitea@gitea.thezengarden.net:chris/drone-test-1.git + remote: gitea@10.10.10.109:chris/drone-test-1.git force: false 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 -- 2.47.1 From 462f84151a9d4459baf4e3fc346442bd119046a3 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 10:33:02 -0500 Subject: [PATCH 08/26] remove some checks; not needed --- .drone.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index ff41175..28f70fe 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,8 +17,6 @@ steps: - ansible-lint --offline $DRONE_WORKSPACE - ansible-playbook -v -i $ANSIBLE_INVENTORY $DRONE_WORKSPACE/hello.yml - echo "Build complete and successful for $DRONE_REPO_NAME" - - whoami - - ls -ltr /root/.ssh when: branch: - development -- 2.47.1 From 6d765332942cc53177b3c6bdc1800bcfaf7b3791 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 10:35:27 -0500 Subject: [PATCH 09/26] add empty_commit --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 28f70fe..3d536d2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -34,6 +34,7 @@ steps: 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" -- 2.47.1 From 4d5fae687223033baf6ef863b68aade307e2e646 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 10:36:16 -0500 Subject: [PATCH 10/26] new conditional --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3d536d2..5a03206 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,7 +19,8 @@ steps: - echo "Build complete and successful for $DRONE_REPO_NAME" when: branch: - - development + include: + - development event: include: - push -- 2.47.1 From 93d839ece1f08c3dc83e1f6b404afd9aa8164282 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 10:36:59 -0500 Subject: [PATCH 11/26] remove push --- .drone.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5a03206..b3af988 100644 --- a/.drone.yml +++ b/.drone.yml @@ -28,20 +28,20 @@ steps: - pull_request - - 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: 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 # --- -- 2.47.1 From 42ad0c68c253ef63d60033afce82443a296fe32c Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 10:39:46 -0500 Subject: [PATCH 12/26] add whoami --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index b3af988..69c52e3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,6 +17,7 @@ steps: - ansible-lint --offline $DRONE_WORKSPACE - ansible-playbook -v -i $ANSIBLE_INVENTORY $DRONE_WORKSPACE/hello.yml - echo "Build complete and successful for $DRONE_REPO_NAME" + - whoami when: branch: include: -- 2.47.1 From ff22e1cb500729978b9fe0241af556549286b7f2 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 10:55:00 -0500 Subject: [PATCH 13/26] remove conditional params --- .drone.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 69c52e3..7b26df5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ type: docker steps: - - name: Install requirements, lint, and run Ansible playbook + - name: Ansible Playbook Lint and Test image: gitea.thezengarden.net/podman/images/ansible-dev:latest environment: GITEA_TOKEN: @@ -20,13 +20,9 @@ steps: - whoami when: branch: - include: - - development + - development event: - include: - - push - exclude: - - pull_request + - push # - name: push commit -- 2.47.1 From b3a3cd6da6dccc6b4cab8b783b20f487f084d3f2 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 10:56:39 -0500 Subject: [PATCH 14/26] re-add commit; add branch condition --- .drone.yml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7b26df5..5d9da74 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,20 +25,23 @@ steps: - 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: 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 + when: + branch: + - development # --- -- 2.47.1 From 48ed5a92bae766e1cf611fc8e4841e3900e4effd Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 11:07:25 -0500 Subject: [PATCH 15/26] 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 # --- -- 2.47.1 From 891aceb04dd68c033fcf816b3dd4e7153c4cc86b Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 11:08:53 -0500 Subject: [PATCH 16/26] fix syntax --- .drone.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0f5501e..998c8df 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ type: docker steps: - - name: Verify environment + - name: "Verify environment" image: gitea.thezengarden.net/podman/images/ansible-dev:latest commands: - hostname @@ -19,7 +19,8 @@ steps: event: - push - - name: Ansible-Galaxy - Install from requirements.yml + - name: "Ansible-Galaxy: Install from requirements.yml" + commands: - ansible-galaxy install -r $DRONE_WORKSPACE/requirements.yml when: branch: @@ -28,7 +29,7 @@ steps: - push - - name: Syntax check / Linting + - name: "Syntax check / Linting" image: gitea.thezengarden.net/podman/images/ansible-dev:latest environment: ANSIBLE_INVENTORY: -- 2.47.1 From ae6f03030e375a2c2a06cee53cd2e74325e63cbd Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 11:09:10 -0500 Subject: [PATCH 17/26] fix missing images --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 998c8df..4233cca 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,6 +20,7 @@ steps: - push - name: "Ansible-Galaxy: Install from requirements.yml" + image: gitea.thezengarden.net/podman/images/ansible-dev:latest commands: - ansible-galaxy install -r $DRONE_WORKSPACE/requirements.yml when: -- 2.47.1 From be2e76a870c92bcef899baa786f97498a172213b Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 11:09:40 -0500 Subject: [PATCH 18/26] remove hostname/whoami --- .drone.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4233cca..2749929 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,8 +8,6 @@ steps: - name: "Verify environment" image: gitea.thezengarden.net/podman/images/ansible-dev:latest commands: - - hostname - - whoami - cd ${DRONE_WORKSPACE} && git log -1 - ansible --version - ansible-lint --version -- 2.47.1 From 4a9aa413f0b29840057f1366c5cf0ecc5d31aadf Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 11:10:12 -0500 Subject: [PATCH 19/26] grrr --- .drone.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 2749929..dad4f03 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,10 @@ steps: - name: "Verify environment" image: gitea.thezengarden.net/podman/images/ansible-dev:latest commands: - - cd ${DRONE_WORKSPACE} && git log -1 + - pwd + - cd ${DRONE_WORKSPACE} + - pwd + - git log -1 - ansible --version - ansible-lint --version when: -- 2.47.1 From 6eed651dc6de210286627cf46a10d2c59200ad82 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 11:10:41 -0500 Subject: [PATCH 20/26] this should work --- .drone.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index dad4f03..d5a51fb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,9 +8,6 @@ steps: - name: "Verify environment" image: gitea.thezengarden.net/podman/images/ansible-dev:latest commands: - - pwd - - cd ${DRONE_WORKSPACE} - - pwd - git log -1 - ansible --version - ansible-lint --version -- 2.47.1 From 353b71d339a55655b76645184e7bafa8eb01a12c Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 11:28:29 -0500 Subject: [PATCH 21/26] more .drone.yml updates --- .drone.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index d5a51fb..3df8b35 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,6 +17,7 @@ steps: event: - push + - name: "Ansible-Galaxy: Install from requirements.yml" image: gitea.thezengarden.net/podman/images/ansible-dev:latest commands: @@ -28,15 +29,25 @@ steps: - push - - name: "Syntax check / Linting" + - name: "Syntax check and Ansible Lint" + image: gitea.thezengarden.net/podman/images/ansible-dev:latest + commands: + - ansible-lint --offline $DRONE_WORKSPACE + - ansible-playbook --syntax-check $DRONE_WORKSPACE/hello.yml + when: + branch: + - development + event: + - push + + + - name: "Test playbook execution" 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 -- 2.47.1 From 5070ee375e05a2388927dc5707bbda00c50e8569 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 11:34:58 -0500 Subject: [PATCH 22/26] update requirements.yml and .drone.yml --- .drone.yml | 12 ++++-------- requirements.yml | 3 --- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3df8b35..6eb685c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,8 +12,7 @@ steps: - ansible --version - ansible-lint --version when: - branch: - - development + branch: development event: - push @@ -23,8 +22,7 @@ steps: commands: - ansible-galaxy install -r $DRONE_WORKSPACE/requirements.yml when: - branch: - - development + branch: development event: - push @@ -35,8 +33,7 @@ steps: - ansible-lint --offline $DRONE_WORKSPACE - ansible-playbook --syntax-check $DRONE_WORKSPACE/hello.yml when: - branch: - - development + branch: development event: - push @@ -49,8 +46,7 @@ steps: commands: - ansible-playbook -v -i 127.0.0.1, --connection=local $DRONE_WORKSPACE/hello.yml when: - branch: - - development + branch: development event: - push diff --git a/requirements.yml b/requirements.yml index 06a0315..552adfe 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,5 +1,2 @@ collections: - community.general - - ansible.netcommon - - community.docker - - containers.podman -- 2.47.1 From e3fbdb375cdacc7a59bd7191fbc377d4f1adbb5f Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 11:40:34 -0500 Subject: [PATCH 23/26] grrrrr --- .drone.yml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6eb685c..c216a1a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,9 +12,11 @@ steps: - ansible --version - ansible-lint --version when: - branch: development + branch: + - development event: - - push + exclude: + - pull_request - name: "Ansible-Galaxy: Install from requirements.yml" @@ -22,9 +24,11 @@ steps: commands: - ansible-galaxy install -r $DRONE_WORKSPACE/requirements.yml when: - branch: development + branch: + - development event: - - push + exclude: + - pull_request - name: "Syntax check and Ansible Lint" @@ -33,9 +37,11 @@ steps: - ansible-lint --offline $DRONE_WORKSPACE - ansible-playbook --syntax-check $DRONE_WORKSPACE/hello.yml when: - branch: development + branch: + - development event: - - push + exclude: + - pull_request - name: "Test playbook execution" @@ -46,9 +52,11 @@ steps: commands: - ansible-playbook -v -i 127.0.0.1, --connection=local $DRONE_WORKSPACE/hello.yml when: - branch: development + branch: + - development event: - - push + exclude: + - pull_request # - name: Update repo with build stats -- 2.47.1 From ed78bb72f7c4aa2468e9b7bb26d356337d4499c7 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 11:54:27 -0500 Subject: [PATCH 24/26] comment out everything --- .drone.yml | 78 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/.drone.yml b/.drone.yml index c216a1a..d129eb5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,44 +19,54 @@ steps: - pull_request - - name: "Ansible-Galaxy: Install from requirements.yml" - image: gitea.thezengarden.net/podman/images/ansible-dev:latest - commands: - - ansible-galaxy install -r $DRONE_WORKSPACE/requirements.yml - when: - branch: - - development - event: - exclude: - - pull_request +############################################################################### +############################################################################### +############################################################################### - - name: "Syntax check and Ansible Lint" - image: gitea.thezengarden.net/podman/images/ansible-dev:latest - commands: - - ansible-lint --offline $DRONE_WORKSPACE - - ansible-playbook --syntax-check $DRONE_WORKSPACE/hello.yml - when: - branch: - - development - event: - exclude: - - pull_request + # - name: "Ansible-Galaxy: Install from requirements.yml" + # image: gitea.thezengarden.net/podman/images/ansible-dev:latest + # commands: + # - ansible-galaxy install -r $DRONE_WORKSPACE/requirements.yml + # when: + # branch: + # - development + # event: + # exclude: + # - pull_request - - name: "Test playbook execution" - image: gitea.thezengarden.net/podman/images/ansible-dev:latest - environment: - ANSIBLE_INVENTORY: - from_secret: ansible_inventory - commands: - - ansible-playbook -v -i 127.0.0.1, --connection=local $DRONE_WORKSPACE/hello.yml - when: - branch: - - development - event: - exclude: - - pull_request + # - name: "Syntax check and Ansible Lint" + # image: gitea.thezengarden.net/podman/images/ansible-dev:latest + # commands: + # - ansible-lint --offline $DRONE_WORKSPACE + # - ansible-playbook --syntax-check $DRONE_WORKSPACE/hello.yml + # when: + # branch: + # - development + # event: + # exclude: + # - pull_request + + + # - name: "Test playbook execution" + # image: gitea.thezengarden.net/podman/images/ansible-dev:latest + # environment: + # ANSIBLE_INVENTORY: + # from_secret: ansible_inventory + # commands: + # - ansible-playbook -v -i 127.0.0.1, --connection=local $DRONE_WORKSPACE/hello.yml + # when: + # branch: + # - development + # event: + # exclude: + # - pull_request + + +############################################################################### +############################################################################### +############################################################################### # - name: Update repo with build stats -- 2.47.1 From 0b2a1bd8826f081fc2ef3a782d15f36285b68f5c Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 11:55:10 -0500 Subject: [PATCH 25/26] remove conditionals. what happens? --- .drone.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index d129eb5..9b9b8d0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,12 +11,12 @@ steps: - git log -1 - ansible --version - ansible-lint --version - when: - branch: - - development - event: - exclude: - - pull_request + # when: + # branch: + # - development + # event: + # exclude: + # - pull_request ############################################################################### -- 2.47.1 From a900700a1c948d3fc3627ff1d5f35da7fbb8ba3c Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 17 Nov 2023 11:56:41 -0500 Subject: [PATCH 26/26] change event --- .drone.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9b9b8d0..21e8c5a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,12 +11,11 @@ steps: - git log -1 - ansible --version - ansible-lint --version - # when: - # branch: - # - development - # event: - # exclude: - # - pull_request + when: + branch: + - development + event: [push] + ############################################################################### -- 2.47.1