Merge pull request 'CHANGE: ensures pulls and updates before running jobs' (#4) from dev into main

Reviewed-on: #4

.gitea/workflows/deploy_new_config.yaml

@@ -16,12 +16,6 @@ jobs:
     if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     steps:
-      - name: Trigger the webhook to start pulling the latest version from the repo
-        # LAN IP is used because those hosts are in the same network
-        run: curl "http://192.168.0.38:9000/hooks/pull-latest"
-      
-      - name: Trigger the webhook to update python and ansible modules
-        run: curl "http://192.168.0.38:9000/hooks/run-update-script"
-     
       - name: Trigger the webhook to run the playbook
+        # LAN IP is used because those hosts are in the same network
         run: curl "http://192.168.0.38:9000/hooks/run-maintain-playbook"

scripts/run_maintain_playbook.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-LOCK_FILE=/tmp/vmn_ansible_lock_file.lock
+# 1 - Pull the latest code
+git pull origin main
 
-while [ -f "$LOCK_FILE" ]
+# 2 - Update dependencies and modules
-do
+./scripts/update_modules.sh
-  sleep 1s
-done
 
+# 3 - Run the job
 source .venv/bin/activate
 ansible-playbook playbooks/maintain.yaml --vault-pass-file ~/vault_password -i inventory/hosts.yaml --private-key ~/.ssh/ansible_key

scripts/update_modules.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Create a lock file to prevent other scripts from running with old modules
-touch /tmp/vmn_ansible_lock_file.lock
-
 source .venv/bin/activate
 
 # Install python packages
@@ -13,6 +10,3 @@ ansible-galaxy collection install -r requirements.yaml -p ./collections/
 
 # Install roles
 ansible-galaxy role install -r requirements.yaml -p ./roles/
-
-# Installation is finished, remove the lock
-rm /tmp/vmn_ansible_lock_file.lock