From 5a44f4d31a441874b6506195d715af7cd004f528 Mon Sep 17 00:00:00 2001 From: Emlyn Kinzett Date: Tue, 16 Aug 2022 10:31:01 +0100 Subject: [PATCH 1/3] Add cache clears to Drupal deployments, before database updates and config import are run. --- roles/_meta/deploy-drupal7/tasks/main.yml | 2 ++ roles/_meta/deploy-drupal8/tasks/main.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/roles/_meta/deploy-drupal7/tasks/main.yml b/roles/_meta/deploy-drupal7/tasks/main.yml index 93e6b1b7..1e453758 100644 --- a/roles/_meta/deploy-drupal7/tasks/main.yml +++ b/roles/_meta/deploy-drupal7/tasks/main.yml @@ -18,6 +18,8 @@ name: database_backup - import_role: name: config_generate +- import_role: + name: cache_clear/cache_clear-drupal7 - import_role: name: database_apply - import_role: diff --git a/roles/_meta/deploy-drupal8/tasks/main.yml b/roles/_meta/deploy-drupal8/tasks/main.yml index 50804566..4a8e0204 100644 --- a/roles/_meta/deploy-drupal8/tasks/main.yml +++ b/roles/_meta/deploy-drupal8/tasks/main.yml @@ -20,6 +20,8 @@ name: database_backup - import_role: name: config_generate +- import_role: + name: cache_clear/cache_clear-drupal8 - import_role: name: database_apply - import_role: From 1e05707bd979f36a91cf375bbdc70c6c6a6fc341 Mon Sep 17 00:00:00 2001 From: Emlyn Kinzett Date: Tue, 16 Aug 2022 11:44:06 +0100 Subject: [PATCH 2/3] Move cache clears out of meta roles and only run in database_apply role on non-initial builds. --- roles/_meta/deploy-drupal7/tasks/main.yml | 2 -- roles/_meta/deploy-drupal8/tasks/main.yml | 2 -- roles/database_apply/database_apply-drupal8/tasks/main.yml | 5 +++++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/roles/_meta/deploy-drupal7/tasks/main.yml b/roles/_meta/deploy-drupal7/tasks/main.yml index 1e453758..93e6b1b7 100644 --- a/roles/_meta/deploy-drupal7/tasks/main.yml +++ b/roles/_meta/deploy-drupal7/tasks/main.yml @@ -18,8 +18,6 @@ name: database_backup - import_role: name: config_generate -- import_role: - name: cache_clear/cache_clear-drupal7 - import_role: name: database_apply - import_role: diff --git a/roles/_meta/deploy-drupal8/tasks/main.yml b/roles/_meta/deploy-drupal8/tasks/main.yml index 4a8e0204..50804566 100644 --- a/roles/_meta/deploy-drupal8/tasks/main.yml +++ b/roles/_meta/deploy-drupal8/tasks/main.yml @@ -20,8 +20,6 @@ name: database_backup - import_role: name: config_generate -- import_role: - name: cache_clear/cache_clear-drupal8 - import_role: name: database_apply - import_role: diff --git a/roles/database_apply/database_apply-drupal8/tasks/main.yml b/roles/database_apply/database_apply-drupal8/tasks/main.yml index dc138585..23cb0b3b 100644 --- a/roles/database_apply/database_apply-drupal8/tasks/main.yml +++ b/roles/database_apply/database_apply-drupal8/tasks/main.yml @@ -32,6 +32,11 @@ loop_var: site when: previous_build_number == 0 or (site.force_install is defined and site.force_install) +- name: Clear the cache. + ansible.builtin.include_role: + name: "cache_clear/cache_clear-{{ project_type }}" + when: previous_build_number > 0 + - name: Apply Drupal database updates. command: cmd: "{{ drush_bin }} -l {{ site.folder }} -y updb" From 17efcffae25563f0651197fa7d3dd63a050a3267 Mon Sep 17 00:00:00 2001 From: Emlyn Kinzett Date: Tue, 16 Aug 2022 12:04:32 +0100 Subject: [PATCH 3/3] Add cache clear stuff to drupal7 database_apply role. --- roles/database_apply/database_apply-drupal7/tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/database_apply/database_apply-drupal7/tasks/main.yml b/roles/database_apply/database_apply-drupal7/tasks/main.yml index 7c2201e2..8b655bda 100644 --- a/roles/database_apply/database_apply-drupal7/tasks/main.yml +++ b/roles/database_apply/database_apply-drupal7/tasks/main.yml @@ -19,6 +19,11 @@ loop_var: site when: previous_build_number == 0 or (site.force_install is defined and site.force_install) +- name: Clear the cache. + ansible.builtin.include_role: + name: "cache_clear/cache_clear-{{ project_type }}" + when: previous_build_number > 0 + - name: Apply Drupal database updates. shell: cmd: "{{ drush_bin }} -l {{ site.folder }} -y updb"