Merge pull request #65 from stackhpc/feature/more-retries

Add retries to tasks that commonly fail in CI

Author: markgoddard

roles/pulp_repository/defaults/main.yml

@@ -9,9 +9,20 @@ pulp_repository_deb_repos: []
 pulp_repository_python_repos: []
 pulp_repository_rpm_repos: []
 
-pulp_repository_sync_retries: 3
+pulp_repository_retries: 3
+pulp_repository_sync_retries: "{{ pulp_repository_retries }}"
+pulp_repository_remote_retries: "{{ pulp_repository_retries }}"
+pulp_repository_create_repository_retries: "{{ pulp_repository_retries }}"
 
 pulp_repository_container_repos_sync_retries: "{{ pulp_repository_sync_retries }}"
+pulp_repository_container_remotes_retries: "{{ pulp_repository_remote_retries }}"
+pulp_repository_container_repositories_retries: "{{ pulp_repository_create_repository_retries }}"
 pulp_repository_deb_repos_sync_retries: "{{ pulp_repository_sync_retries }}"
+pulp_repository_deb_remotes_retries: "{{ pulp_repository_remote_retries }}"
+pulp_repository_deb_repositories_retries: "{{ pulp_repository_create_repository_retries }}"
 pulp_repository_python_repos_sync_retries: "{{ pulp_repository_sync_retries }}"
+pulp_repository_python_remotes_retries: "{{ pulp_repository_remote_retries }}"
+pulp_repository_python_repositories_retries: "{{ pulp_repository_create_repository_retries }}"
 pulp_repository_rpm_repos_sync_retries: "{{ pulp_repository_sync_retries }}"
+pulp_repository_rpm_remotes_retries: "{{ pulp_repository_remote_retries }}"
+pulp_repository_rpm_repositories_retries: "{{ pulp_repository_create_repository_retries }}"

roles/pulp_repository/tasks/container.yml

@@ -10,6 +10,10 @@
   loop: "{{ pulp_repository_container_repos | map(attribute='name') }}"
   loop_control:
     index_var: repository_index
+  register: pulp_repository_container_repositories
+  until: "pulp_repository_container_repositories is not failed"
+  retries: "{{ pulp_repository_container_repositories_retries }}"
+  delay: 1
 
 - name: Setup container remotes
   pulp.squeezer.container_remote:
@@ -40,6 +44,10 @@
   loop: "{{ pulp_repository_container_repos | map(attribute='name') }}"
   loop_control:
     index_var: repository_index
+  register: pulp_repository_container_remotes
+  until: "pulp_repository_container_remotes is not failed"
+  retries: "{{ pulp_repository_container_remotes_retries }}"
+  delay: 1
 
 - name: Sync container remotes into repositories
   pulp.squeezer.container_sync:

roles/pulp_repository/tasks/deb.yml

@@ -10,6 +10,10 @@
   loop: "{{ pulp_repository_deb_repos | map(attribute='name') }}"
   loop_control:
     index_var: repository_index
+  register: pulp_repository_deb_repositories
+  until: "pulp_repository_deb_repositories is not failed"
+  retries: "{{ pulp_repository_deb_repositories_retries }}"
+  delay: 1
 
 - name: Setup DEB remotes
   pulp.squeezer.deb_remote:
@@ -40,6 +44,10 @@
   loop: "{{ pulp_repository_deb_repos | map(attribute='name') }}"
   loop_control:
     index_var: repository_index
+  register: pulp_repository_deb_remotes
+  until: "pulp_repository_deb_remotes is not failed"
+  retries: "{{ pulp_repository_deb_remotes_retries }}"
+  delay: 1
 
 - name: Sync DEB remotes into repositories
   pulp.squeezer.deb_sync:

roles/pulp_repository/tasks/python.yml

@@ -10,6 +10,10 @@
   loop: "{{ pulp_repository_python_repos | map(attribute='name') }}"
   loop_control:
     index_var: repository_index
+  register: pulp_repository_python_repositories
+  until: "pulp_repository_python_repositories is not failed"
+  retries: "{{ pulp_repository_python_repositories_retries }}"
+  delay: 1
 
 - name: Setup PyPI remotes
   pulp.squeezer.python_remote:
@@ -40,6 +44,10 @@
   loop: "{{ pulp_repository_python_repos | map(attribute='name') }}"
   loop_control:
     index_var: repository_index
+  register: pulp_repository_python_remotes
+  until: "pulp_repository_python_remotes is not failed"
+  retries: "{{ pulp_repository_python_remotes_retries }}"
+  delay: 1
 
 - name: Sync PyPI remotes into repositories
   pulp.squeezer.python_sync:

roles/pulp_repository/tasks/rpm.yml

@@ -10,6 +10,10 @@
   loop: "{{ pulp_repository_rpm_repos | map(attribute='name') }}"
   loop_control:
     index_var: repository_index
+  register: pulp_repository_rpm_repositories
+  until: "pulp_repository_rpm_repositories is not failed"
+  retries: "{{ pulp_repository_rpm_repositories_retries }}"
+  delay: 1
 
 - name: Setup RPM remotes
   pulp.squeezer.rpm_remote:
@@ -37,6 +41,10 @@
   loop: "{{ pulp_repository_rpm_repos | map(attribute='name') }}"
   loop_control:
     index_var: repository_index
+  register: pulp_repository_rpm_remotes
+  until: "pulp_repository_rpm_remotes is not failed"
+  retries: "{{ pulp_repository_rpm_remotes_retries }}"
+  delay: 1
 
 - name: Sync RPM remotes into repositories
   pulp.squeezer.rpm_sync: