Skip to content

Commit fd46625

Browse files
committed
update mongo used for tests
1 parent 9bb6834 commit fd46625

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

.github/workflows/test-integration.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,21 @@ jobs:
1717
docker compose --file docker/docker-compose.yml build
1818
docker compose --file docker/docker-compose.yml up -d
1919
- name: Sleep
20-
run: bash -c "while ! docker compose --file docker/docker-compose.yml logs --tail=10 cveawg | grep -q 'Serving on port'; do sleep 1; done"
20+
run: |
21+
dockercompose="docker compose --file docker/docker-compose.yml"
22+
attempts=60
23+
while ! $dockercompose logs cveawg | grep -q 'Serving on port'; do
24+
attempts=$(expr $attempts - 1)
25+
if [ $($dockercompose ps --status running -q | wc -l) -eq 2 ] && [ $attempts -gt 0 ]; then
26+
sleep 1
27+
$dockercompose logs || true
28+
continue
29+
fi
30+
$dockercompose ps || true
31+
$dockercompose logs || true
32+
echo "==== COULD NOT FIND 'Serving on port' in cveawg output OR one of the services died ====" 1>&2
33+
exit 1
34+
done
2135
- name: Run Tests
2236
run: docker compose -f docker/docker-compose.yml exec -T cveawg npm run test:integration
2337
continue-on-error: false

docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
docdb:
33
# use a mongo image that most closely matches the DocumentDB API
4-
image: mongo:3.6.20-xenial
4+
image: mongo:5.0
55
container_name: mongo
66
env_file: .docker-env
77
networks: ["cve-services"]

0 commit comments

Comments
 (0)