diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2024-02-02 14:26:02 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2024-02-02 14:58:49 +0000 |
| commit | 94bd013ed55fd79bc4bfa33121c823927ec40b56 (patch) | |
| tree | 84b28444b5773f18d5c6bfe8d5e113e8ab0c74a8 /docker/kolla-toolbox | |
| parent | d7a03105bf0016e46e60fcc15b7d5a8e4e205cc5 (diff) | |
| download | kolla-94bd013ed55fd79bc4bfa33121c823927ec40b56.tar.gz kolla-94bd013ed55fd79bc4bfa33121c823927ec40b56.zip | |
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
Diffstat (limited to 'docker/kolla-toolbox')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index c8bde70a3..273ddb4e7 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -85,8 +85,10 @@ RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools']) }} \ {% block kolla_toolbox_collections_install %} COPY requirements.yml /var/lib/ansible/ -RUN for i in {1..5}; do ansible-galaxy collection install --timeout 120 -p /usr/share/ansible/collections -r /var/lib/ansible/requirements.yml \ - && break || sleep 15; done +RUN fail=1; for i in $(seq 1 5); do if \ +ansible-galaxy collection install --timeout 120 -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 %} |