From 70f7dbdb61d6a53f981567dfceb6e46513e98e66 Mon Sep 17 00:00:00 2001
From: Howard Edwards <howarde.edwards@gmail.com>
Date: Mon, 13 Jan 2025 10:17:24 -0500
Subject: [PATCH] Testing ansible version bump to 2.16 to maintain
 compatibility with deploy environment

---
 .github/workflows/deploy-staging.yml    |  4 ++--
 deploy/provision.yml                    |  2 +-
 deploy/roles/application/tasks/main.yml | 12 ++++++------
 deploy/roles/nodejs/tasks/main.yml      |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
index a88d06939..87991fd9b 100644
--- a/.github/workflows/deploy-staging.yml
+++ b/.github/workflows/deploy-staging.yml
@@ -3,7 +3,7 @@ name: Deploy to staging (aria-at-staging.w3.org)
 on:
   push:
     branches:
-      - development
+      - ansible-bump
 
 jobs:
   deploy-staging:
@@ -22,7 +22,7 @@ jobs:
           python-version: '3.10'
       - name: Install ansible and deploy to staging
         run: |
-          python -m pip install --user ansible-core==2.11.1
+          python -m pip install --user ansible-core==2.16.14
           cd deploy
           echo ${{ secrets.ANSIBLE_VAULT_PASSWORD }} > ansible-vault-password.txt
           ansible-vault view --vault-password-file ansible-vault-password.txt files/jwt-signing-key.pem.enc > ../jwt-signing-key.pem
diff --git a/deploy/provision.yml b/deploy/provision.yml
index a44ca3bf3..64d182c47 100644
--- a/deploy/provision.yml
+++ b/deploy/provision.yml
@@ -2,7 +2,7 @@
 - hosts: all
   become_method: sudo
   pre_tasks:
-    - include: tasks/prompt-for-become-password.yml
+    - import_tasks: tasks/prompt-for-become-password.yml
       when: needs_become_password|default(false, true)
   roles:
     - permissions
diff --git a/deploy/roles/application/tasks/main.yml b/deploy/roles/application/tasks/main.yml
index db5b9b7ff..ef6249408 100644
--- a/deploy/roles/application/tasks/main.yml
+++ b/deploy/roles/application/tasks/main.yml
@@ -8,7 +8,7 @@
   set_fact:
     source_dir: /home/{{application_user}}/aria-at-report
 
-- include: upload-source-code.yml
+- include_tasks: upload-source-code.yml
 
 - name: Allow aria-bot user to run import script as admin on sandbox
   lineinfile:
@@ -28,7 +28,7 @@
     recurse: yes
   become: yes
   when: deployment_mode != 'development'
-  notify: "restart server"
+  notify: 'restart server'
 
 - name: Make server resources folder writable for import tests API endpoint
   file:
@@ -37,7 +37,7 @@
     recurse: yes
   become: yes
   when: deployment_mode != 'development'
-  notify: "restart server"
+  notify: 'restart server'
 
 - name: Make client resources folder writable for import harness
   file:
@@ -46,7 +46,7 @@
     recurse: yes
   become: yes
   when: deployment_mode != 'development'
-  notify: "restart server"
+  notify: 'restart server'
 
 - name: Link application code
   file:
@@ -108,6 +108,6 @@
   args:
     chdir: '{{source_dir}}'
 
-- include: service.yml
+- import_tasks: service.yml
 
-- include: cron.yml
+- include_tasks: cron.yml
diff --git a/deploy/roles/nodejs/tasks/main.yml b/deploy/roles/nodejs/tasks/main.yml
index e8d6c538c..91ff64933 100644
--- a/deploy/roles/nodejs/tasks/main.yml
+++ b/deploy/roles/nodejs/tasks/main.yml
@@ -8,7 +8,7 @@
     - https://dl.yarnpkg.com/debian/pubkey.gpg
     - https://deb.nodesource.com/gpgkey/nodesource.gpg.key
 
-- include: upgrade.yml
+- include_tasks: upgrade.yml
 
 - name: Add software repositories
   apt_repository: