Skip to content

Commit e1c2532

Browse files
committed
feat(ci): fips image pull step service readiness checks
1 parent 48dfa71 commit e1c2532

1 file changed

Lines changed: 35 additions & 6 deletions

File tree

.github/workflows/ci-test-e2e.yml

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,11 @@ jobs:
204204
mkdir -p $COVERAGE_DIR
205205
chmod 777 $COVERAGE_DIR
206206
207+
- name: Pull FIPS images
208+
if: inputs.release == 'fips' && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
209+
run: |
210+
docker compose $COMPOSE_FILES pull
211+
207212
- name: Start containers for CE
208213
if: inputs.release == 'ce'
209214
run: |
@@ -216,7 +221,11 @@ jobs:
216221
ENTERPRISE_LICENSE: ${{ inputs.enterprise-license }}
217222
TRANSPORTER: ${{ inputs.transporter }}
218223
run: |
219-
DEBUG_LOG_LEVEL=${DEBUG_LOG_LEVEL:-0} docker compose $COMPOSE_FILES up -d --wait
224+
if [[ '${{ inputs.release }}' == 'fips' ]]; then
225+
DEBUG_LOG_LEVEL=${DEBUG_LOG_LEVEL:-0} docker compose $COMPOSE_FILES up -d --wait --no-build
226+
else
227+
DEBUG_LOG_LEVEL=${DEBUG_LOG_LEVEL:-0} docker compose $COMPOSE_FILES up -d --wait
228+
fi
220229
221230
- uses: ./.github/actions/setup-playwright
222231
if: inputs.type == 'ui'
@@ -226,11 +235,31 @@ jobs:
226235
run: |
227236
docker ps
228237
229-
until echo "$(docker compose $COMPOSE_FILES logs ddp-streamer-service)" | grep -q "NetworkBroker started successfully"; do
230-
echo "Waiting 'ddp-streamer' to start up"
231-
((c++)) && ((c==10)) && docker compose $COMPOSE_FILES logs ddp-streamer-service && exit 1
232-
sleep 10
233-
done;
238+
wait_for_service() {
239+
local service="$1"
240+
local retries=18
241+
local delay=10
242+
243+
for attempt in $(seq 1 "$retries"); do
244+
if docker compose $COMPOSE_FILES logs "$service" | grep -q "NetworkBroker started successfully"; then
245+
echo "Service '$service' is ready"
246+
return 0
247+
fi
248+
249+
echo "Waiting '$service' to start up (attempt ${attempt}/${retries})"
250+
sleep "$delay"
251+
done
252+
253+
echo "Service '$service' did not become ready in time"
254+
docker compose $COMPOSE_FILES logs "$service"
255+
return 1
256+
}
257+
258+
wait_for_service ddp-streamer-service
259+
wait_for_service account-service
260+
wait_for_service authorization-service
261+
wait_for_service queue-worker-service
262+
wait_for_service presence-service
234263
235264
- name: Remove unused Docker images
236265
run: docker system prune -af

0 commit comments

Comments
 (0)