diff options
| author | Zuul <zuul@review.opendev.org> | 2024-02-03 11:15:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-02-03 11:15:19 +0000 |
| commit | e024397e9a4239f48da734863ac2d2043bfbcc0f (patch) | |
| tree | f10a40675cb0309a7f827246ff40bccfe3080a79 | |
| parent | f4edc7e1c15788b87d80513ff255b832b2e41eb5 (diff) | |
| parent | 94bd013ed55fd79bc4bfa33121c823927ec40b56 (diff) | |
| download | kolla-e024397e9a4239f48da734863ac2d2043bfbcc0f.tar.gz kolla-e024397e9a4239f48da734863ac2d2043bfbcc0f.zip | |
Merge "toolbox: Improve retry loop for ansible-galaxy"
| -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 %} |