Skip to content

Commit

Permalink
Testing ansible version bump to 2.16 to maintain compatibility with d…
Browse files Browse the repository at this point in the history
…eploy environment
  • Loading branch information
howard-e committed Jan 13, 2025
1 parent 971707b commit 70f7dbd
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy to staging (aria-at-staging.w3.org)
on:
push:
branches:
- development
- ansible-bump

jobs:
deploy-staging:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deploy/provision.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions deploy/roles/application/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -46,7 +46,7 @@
recurse: yes
become: yes
when: deployment_mode != 'development'
notify: "restart server"
notify: 'restart server'

- name: Link application code
file:
Expand Down Expand Up @@ -108,6 +108,6 @@
args:
chdir: '{{source_dir}}'

- include: service.yml
- import_tasks: service.yml

- include: cron.yml
- include_tasks: cron.yml
2 changes: 1 addition & 1 deletion deploy/roles/nodejs/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 70f7dbd

Please sign in to comment.