From a82739115e83574209900974ff7c46b11e021dae Mon Sep 17 00:00:00 2001 From: tim Date: Tue, 15 Jul 2025 11:54:45 +0300 Subject: [PATCH 1/2] more_specifix_names_to_clean_up --- roles/_init/tasks/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/_init/tasks/main.yml b/roles/_init/tasks/main.yml index f5fac276..b94b9cb1 100644 --- a/roles/_init/tasks/main.yml +++ b/roles/_init/tasks/main.yml @@ -157,6 +157,7 @@ paths: "{{ deploy_base_path }}" recurse: false file_type: directory + patterns: "{{ project_name }}_{{ build_type }}_build_*" register: _build_directories_general - name: Find all directories in the build directory if SquashFS. @@ -164,6 +165,7 @@ paths: "{{ build_base_path }}" recurse: false file_type: directory + patterns: "{{ project_name }}_{{ build_type }}_build_*" register: _build_directories_squashfs when: - deploy_code.mount_type is defined From 1d10816f0cc2c2829046321ed55bd41109dcb379 Mon Sep 17 00:00:00 2001 From: tim Date: Tue, 15 Jul 2025 12:14:29 +0300 Subject: [PATCH 2/2] more_specifix_names_to_clean_up --- roles/_init/defaults/main.yml | 1 + roles/_init/tasks/main.yml | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/roles/_init/defaults/main.yml b/roles/_init/defaults/main.yml index b0fa647b..66af7dd2 100644 --- a/roles/_init/defaults/main.yml +++ b/roles/_init/defaults/main.yml @@ -12,6 +12,7 @@ lock_file: /tmp/ce-deploy-lock provision_lock_file: /tmp/ce-provision-lock # must match _init.lock_file in ce-provision skip_build_path_check: false # by default we're checking if track number matches keep_builds: 10 # the number of builds to keep in the build history, includes associated databases +build_cleanup_pattern: "{{ project_name }}_{{ build_type }}_build_*" # name pattern of the builds to be checked for cleanup # Application specific variables. drupal: drush_verbose_output: false diff --git a/roles/_init/tasks/main.yml b/roles/_init/tasks/main.yml index b94b9cb1..b2be45d8 100644 --- a/roles/_init/tasks/main.yml +++ b/roles/_init/tasks/main.yml @@ -152,20 +152,20 @@ _build_numbers_clean: [] _build_numbers_to_delete: [] - - name: Find all directories in this project deploy directory. + - name: Find the relevant directories in this project deploy directory. ansible.builtin.find: paths: "{{ deploy_base_path }}" recurse: false file_type: directory - patterns: "{{ project_name }}_{{ build_type }}_build_*" + patterns: "{{ build_cleanup_pattern }}" register: _build_directories_general - - name: Find all directories in the build directory if SquashFS. + - name: Find the relevant directories in the build directory if SquashFS. ansible.builtin.find: paths: "{{ build_base_path }}" recurse: false file_type: directory - patterns: "{{ project_name }}_{{ build_type }}_build_*" + patterns: "{{ build_cleanup_pattern }}" register: _build_directories_squashfs when: - deploy_code.mount_type is defined