From a876b1cca8c0462eff06cdf8c60bf22298009b17 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Fri, 2 Feb 2024 14:26:02 +0100 Subject: [PATCH] toolbox: Improve retry loop for ansible-galaxy Currently if it somehow fails for 5 times - we get exit code 0. Closes-Bug: #2052293 Change-Id: I2bdeb77e3133123053b05adcbde3a426c60f3304 (cherry picked from commit 94bd013ed55fd79bc4bfa33121c823927ec40b56) --- docker/kolla-toolbox/Dockerfile.j2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 9c406db8e7..9cf9b55b89 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -97,7 +97,10 @@ RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools']) }} \ {% block kolla_toolbox_collections_install %} COPY requirements.yml /var/lib/ansible/ -RUN ansible-galaxy collection install -p /usr/share/ansible/collections -r /var/lib/ansible/requirements.yml +RUN fail=1; for i in $(seq 1 5); do if \ +ansible-galaxy collection install -p /usr/share/ansible/collections -r /var/lib/ansible/requirements.yml \ +; then fail=0; break; fi; echo "Collection download failed, retrying"; sleep 5; done; \ +if [ "$fail" -eq 1 ]; then exit 1; fi ENV ANSIBLE_LIBRARY /usr/share/ansible:$ANSIBLE_LIBRARY {% endblock %}