From b5d5747e45fdef4b4020dbc5be96e952978a0427 Mon Sep 17 00:00:00 2001 From: saltydk Date: Sun, 14 Jul 2024 12:03:27 +0200 Subject: [PATCH] various: use global retry values for tasks using the CI value anyway --- resources/tasks/dns/tasker2.yml | 5 +++-- .../tasks/docker/create_docker_container.yml | 12 ++++++++--- .../tasks/docker/remove_docker_container.yml | 4 +++- .../tasks/docker/restart_docker_container.yml | 8 ++++++-- .../tasks/docker/start_docker_container.yml | 4 +++- .../tasks/docker/stop_docker_container.yml | 4 +++- roles/asshama/tasks/subtasks/loop.yml | 4 +++- roles/btop/tasks/main.yml | 4 +++- roles/ctop/tasks/main.yml | 4 +++- roles/docker/tasks/subtasks/binary/binary.yml | 8 ++++++-- roles/mainline/tasks/main.yml | 8 ++++++-- roles/node_exporter/tasks/main.yml | 4 +++- roles/python/tasks/main.yml | 8 ++++++-- .../tasks/subtasks/02_install_binary.yml | 8 ++++++-- roles/scripts/tasks/main.yml | 20 ++++++++++++++----- roles/transfer/tasks/main.yml | 4 +++- roles/unionfs/tasks/subtasks/mergerfs.yml | 4 +++- roles/yyq/tasks/main.yml | 4 +++- 18 files changed, 87 insertions(+), 30 deletions(-) diff --git a/resources/tasks/dns/tasker2.yml b/resources/tasks/dns/tasker2.yml index 072976d04d..ca8e6722cc 100644 --- a/resources/tasks/dns/tasker2.yml +++ b/resources/tasks/dns/tasker2.yml @@ -45,8 +45,9 @@ - name: Resources | Tasks | DNS | Tasker | Set '_dns_*' variables ansible.builtin.set_fact: _dns_tasker_zone: "{{ fld.stdout }}" - _dns_tasker_record: "{{ subdomain if (subdomain | length > 0) - else '@' }}" + _dns_tasker_record: "{{ subdomain + if (subdomain | length > 0) + else '@' }}" _dns_tasker_action: "{{ dns_action | default('add') }}" _dns_tasker_proxy: "{{ dns_proxy | default(dns.proxied) }}" diff --git a/resources/tasks/docker/create_docker_container.yml b/resources/tasks/docker/create_docker_container.yml index 4f539c7e7b..48e913da03 100644 --- a/resources/tasks/docker/create_docker_container.yml +++ b/resources/tasks/docker/create_docker_container.yml @@ -113,8 +113,12 @@ volumes_from: "{{ lookup('vars', _var_prefix + '_docker_volumes_from', default=omit) }}" working_dir: "{{ lookup('vars', _var_prefix + '_docker_working_dir', default=omit) }}" register: create_docker_result - retries: "{{ ansible_retry_count if (not continuous_integration) else ansible_retry_count_ci }}" - timeout: "{{ 120 if continuous_integration else omit }}" + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" + timeout: "{{ 120 + if continuous_integration + else omit }}" delay: 10 until: create_docker_result is succeeded @@ -125,6 +129,8 @@ dangling: true when: docker_create_image_prune register: prune_images_result - retries: "{{ ansible_retry_count if (not continuous_integration) else ansible_retry_count_ci }}" + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 until: prune_images_result is succeeded diff --git a/resources/tasks/docker/remove_docker_container.yml b/resources/tasks/docker/remove_docker_container.yml index a68b4bb695..8ee5170b43 100644 --- a/resources/tasks/docker/remove_docker_container.yml +++ b/resources/tasks/docker/remove_docker_container.yml @@ -23,6 +23,8 @@ stop_timeout: "{{ lookup('vars', _var_prefix + '_docker_stop_timeout', default='10') }}" tls_hostname: localhost register: remove_docker_result - retries: "{{ ansible_retry_count if (not continuous_integration) else ansible_retry_count_ci }}" + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 until: remove_docker_result is succeeded diff --git a/resources/tasks/docker/restart_docker_container.yml b/resources/tasks/docker/restart_docker_container.yml index eea88b43fc..d1f51c340a 100644 --- a/resources/tasks/docker/restart_docker_container.yml +++ b/resources/tasks/docker/restart_docker_container.yml @@ -25,7 +25,9 @@ comparisons: '*': ignore register: stop_docker_result - retries: "{{ ansible_retry_count if (not continuous_integration) else ansible_retry_count_ci }}" + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 until: stop_docker_result is succeeded @@ -38,6 +40,8 @@ comparisons: '*': ignore register: start_docker_result - retries: "{{ ansible_retry_count if (not continuous_integration) else ansible_retry_count_ci }}" + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 until: start_docker_result is succeeded diff --git a/resources/tasks/docker/start_docker_container.yml b/resources/tasks/docker/start_docker_container.yml index 78a363b6e7..a90e47ada2 100644 --- a/resources/tasks/docker/start_docker_container.yml +++ b/resources/tasks/docker/start_docker_container.yml @@ -22,6 +22,8 @@ comparisons: '*': ignore register: start_docker_result - retries: "{{ ansible_retry_count if (not continuous_integration) else ansible_retry_count_ci }}" + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 until: start_docker_result is succeeded diff --git a/resources/tasks/docker/stop_docker_container.yml b/resources/tasks/docker/stop_docker_container.yml index c886853220..2f1df6120e 100644 --- a/resources/tasks/docker/stop_docker_container.yml +++ b/resources/tasks/docker/stop_docker_container.yml @@ -25,6 +25,8 @@ comparisons: '*': ignore register: stop_docker_result - retries: "{{ ansible_retry_count if (not continuous_integration) else ansible_retry_count_ci }}" + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 until: stop_docker_result is succeeded diff --git a/roles/asshama/tasks/subtasks/loop.yml b/roles/asshama/tasks/subtasks/loop.yml index b7aaf556d2..4712f5d372 100644 --- a/roles/asshama/tasks/subtasks/loop.yml +++ b/roles/asshama/tasks/subtasks/loop.yml @@ -47,7 +47,9 @@ mode: "0775" register: x until: "x is not failed" - retries: 5 + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 - name: "Set ASS directory permissions" diff --git a/roles/btop/tasks/main.yml b/roles/btop/tasks/main.yml index 52993fda69..fcc90b1170 100644 --- a/roles/btop/tasks/main.yml +++ b/roles/btop/tasks/main.yml @@ -31,7 +31,9 @@ mode: "0755" register: x until: "x is not failed" - retries: 5 + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 - name: "btop | Unpack btop" diff --git a/roles/ctop/tasks/main.yml b/roles/ctop/tasks/main.yml index dbb219dba9..141cd67c1e 100644 --- a/roles/ctop/tasks/main.yml +++ b/roles/ctop/tasks/main.yml @@ -26,7 +26,9 @@ ignore_errors: true register: ctop_download_status until: "ctop_download_status is not failed" - retries: 5 + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 - name: Tasks to do when ctop download is successful diff --git a/roles/docker/tasks/subtasks/binary/binary.yml b/roles/docker/tasks/subtasks/binary/binary.yml index 69d8e95048..32cc8b4b78 100644 --- a/roles/docker/tasks/subtasks/binary/binary.yml +++ b/roles/docker/tasks/subtasks/binary/binary.yml @@ -44,7 +44,9 @@ dest: /etc/apt/keyrings/docker.asc mode: "0644" register: result - retries: "{{ ansible_retry_count if (not continuous_integration) else ansible_retry_count_ci }}" + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 until: result is succeeded @@ -54,7 +56,9 @@ filename: "{{ docker_apt_repo_filename }}" update_cache: true register: result - retries: "{{ ansible_retry_count if (not continuous_integration) else ansible_retry_count_ci }}" + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 until: result is succeeded diff --git a/roles/mainline/tasks/main.yml b/roles/mainline/tasks/main.yml index e28f543a5a..0930b8d79f 100644 --- a/roles/mainline/tasks/main.yml +++ b/roles/mainline/tasks/main.yml @@ -48,7 +48,9 @@ dest: /etc/apt/keyrings/cappelikan.asc mode: "0644" register: result - retries: "{{ '0' if (not continuous_integration) else '5' }}" + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 until: result is succeeded @@ -58,7 +60,9 @@ state: present update_cache: true register: result - retries: "{{ ansible_retry_count if (not continuous_integration) else ansible_retry_count_ci }}" + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 until: result is succeeded diff --git a/roles/node_exporter/tasks/main.yml b/roles/node_exporter/tasks/main.yml index e155b6ba66..96ef610c12 100644 --- a/roles/node_exporter/tasks/main.yml +++ b/roles/node_exporter/tasks/main.yml @@ -35,7 +35,9 @@ validate_certs: false register: x until: "x is not failed" - retries: 5 + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 - name: Create directories diff --git a/roles/python/tasks/main.yml b/roles/python/tasks/main.yml index 9771ed2f45..096774565a 100644 --- a/roles/python/tasks/main.yml +++ b/roles/python/tasks/main.yml @@ -59,7 +59,9 @@ dest: /etc/apt/keyrings/deadsnakes.asc mode: "0644" register: result - retries: "{{ '0' if (not continuous_integration) else '5' }}" + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 until: result is succeeded @@ -69,7 +71,9 @@ state: present update_cache: true register: result - retries: "{{ ansible_retry_count if (not continuous_integration) else ansible_retry_count_ci }}" + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 until: result is succeeded diff --git a/roles/rclone/tasks/subtasks/02_install_binary.yml b/roles/rclone/tasks/subtasks/02_install_binary.yml index 08ed073f9a..e9d369475c 100644 --- a/roles/rclone/tasks/subtasks/02_install_binary.yml +++ b/roles/rclone/tasks/subtasks/02_install_binary.yml @@ -45,7 +45,9 @@ validate_certs: false register: x until: "x is not failed" - retries: 5 + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 timeout: 60 @@ -58,7 +60,9 @@ validate_certs: false register: x until: "x is not failed" - retries: 5 + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 timeout: 60 diff --git a/roles/scripts/tasks/main.yml b/roles/scripts/tasks/main.yml index 0601c2acfd..93ea08bce4 100644 --- a/roles/scripts/tasks/main.yml +++ b/roles/scripts/tasks/main.yml @@ -48,7 +48,9 @@ validate_certs: false register: x until: "x is not failed" - retries: 5 + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 ignore_errors: true @@ -63,7 +65,9 @@ validate_certs: false register: x until: "x is not failed" - retries: 5 + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 ignore_errors: true @@ -78,7 +82,9 @@ validate_certs: false register: x until: "x is not failed" - retries: 5 + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 ignore_errors: true @@ -158,7 +164,9 @@ validate_certs: false register: x until: "x is not failed" - retries: 5 + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 ignore_errors: true @@ -173,6 +181,8 @@ validate_certs: false register: x until: "x is not failed" - retries: 5 + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 ignore_errors: true diff --git a/roles/transfer/tasks/main.yml b/roles/transfer/tasks/main.yml index a29eb4e362..6d6cb502f8 100644 --- a/roles/transfer/tasks/main.yml +++ b/roles/transfer/tasks/main.yml @@ -49,7 +49,9 @@ ignore_errors: true register: x until: "x is not failed" - retries: 5 + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 - name: "Get transfer version" diff --git a/roles/unionfs/tasks/subtasks/mergerfs.yml b/roles/unionfs/tasks/subtasks/mergerfs.yml index b9a3d09238..cccaa74c76 100644 --- a/roles/unionfs/tasks/subtasks/mergerfs.yml +++ b/roles/unionfs/tasks/subtasks/mergerfs.yml @@ -36,7 +36,9 @@ state: present register: mergerfs_install_result until: "mergerfs_install_result is not failed" - retries: 5 + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 - name: "MergerFS | Import '{{ mergerfs_service_name }}'" diff --git a/roles/yyq/tasks/main.yml b/roles/yyq/tasks/main.yml index 4a56e3c643..f314aebaae 100644 --- a/roles/yyq/tasks/main.yml +++ b/roles/yyq/tasks/main.yml @@ -49,7 +49,9 @@ timeout: 20 register: x until: "x is not failed" - retries: 5 + retries: "{{ ansible_retry_count + if (not continuous_integration) + else ansible_retry_count_ci }}" delay: 10 - name: "Get yyq version"