File tree Expand file tree Collapse file tree 3 files changed +17
-14
lines changed
packages/pytest-simcore/src/pytest_simcore Expand file tree Collapse file tree 3 files changed +17
-14
lines changed Original file line number Diff line number Diff line change @@ -165,9 +165,23 @@ def docker_stack(
165165 # make down
166166 # NOTE: remove them in reverse order since stacks share common networks
167167 WAIT_BEFORE_RETRY_SECS = 1
168+
169+ HEADER = "{:-^20}"
168170 stacks .reverse ()
169171 for _ , stack , _ in stacks :
170- subprocess .run (f"docker stack remove { stack } " , shell = True , check = True )
172+
173+ try :
174+ subprocess .run (f"docker stack remove { stack } " , shell = True , check = True )
175+ except subprocess .CalledProcessError as err :
176+ log .warning (
177+ "Ignoring failure while executing '%s' (returned code %d):\n %s\n %s\n %s\n %s\n " ,
178+ err .cmd ,
179+ err .returncode ,
180+ HEADER .format ("stdout" ),
181+ err .stdout ,
182+ HEADER .format ("stderr" ),
183+ err .stderr ,
184+ )
171185
172186 while docker_client .services .list (
173187 filters = {"label" : f"com.docker.stack.namespace={ stack } " }
Original file line number Diff line number Diff line change @@ -151,13 +151,7 @@ ENV SC_BUILD_TARGET=development
151151WORKDIR /devel
152152RUN chown -R scu:scu "${VIRTUAL_ENV}"
153153
154-
155- HEALTHCHECK \
156- --interval=60s \
157- --timeout=60s \
158- --start-period=10s \
159- --retries=3 \
160- CMD ["echo" , , "Fake healthcheck because it takes very long to boot in devel mode" ]
154+ # NOTE: devel mode does NOT have HEALTHCHECK
161155
162156ENTRYPOINT [ "/bin/sh" , "services/dask-sidecar/docker/entrypoint.sh" ]
163157CMD ["/bin/sh" , "services/dask-sidecar/docker/boot.sh" ]
Original file line number Diff line number Diff line change @@ -140,12 +140,7 @@ ENV SC_BUILD_TARGET=development
140140WORKDIR /devel
141141RUN chown -R scu:scu "${VIRTUAL_ENV}"
142142
143- # we use the celery API
144- HEALTHCHECK --interval=60s \
145- --timeout=60s \
146- --start-period=120s \
147- --retries=3 \
148- CMD celery inspect ping -b amqp://${RABBIT_USER}:${RABBIT_PASSWORD}@${RABBIT_HOST}:${RABBIT_PORT} -d sidecar."$(cat ${SIDECAR_HOST_HOSTNAME_PATH})" @${HOSTNAME}
143+ # NOTE: devel mode does NOT have HEALTHCHECK
149144
150145ENTRYPOINT [ "/bin/sh" , "services/sidecar/docker/entrypoint.sh" ]
151146CMD ["/bin/sh" , "services/sidecar/docker/boot.sh" ]
You can’t perform that action at this time.
0 commit comments