various: use global retry values for tasks using the CI value anyway

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) }}"
 

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

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

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

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

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

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"

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"

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

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
 

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
 

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

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
 

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
 

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

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"

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 }}'"

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"