Skip to content

Fix local jaeger #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hardbyte merged 2 commits into from
Mar 4, 2020
Merged

Fix local jaeger #523

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39cfe94
Configure jaeger for docker-compose
hardbyte Mar 3, 2020
1540c0f
Tweak to allow debugging of tests from docker-compose
hardbyte Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Tweak to allow debugging of tests from docker-compose
  • Loading branch information
@hardbyte
hardbyte committed Mar 3, 2020
commit 1540c0f12461d5a4f2681b89fb850a21ee214d0b
3 changes: 1 addition & 2 deletions tools/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ services:
- SERVER=http://nginx:8851
- INITIAL_DELAY=20
- JAEGER_AGENT_HOST=jaeger
- JAEGER_SERVICE_NAME=e2etests
entrypoint: /bin/sh -c "dockerize -wait tcp://nginx:8851/v1/status -timeout 1m python -m pytest -n 16 entityservice/tests --junitxml=testResults.xml -x"
command: /bin/sh -c "dockerize -wait tcp://nginx:8851/v1/status -timeout 1m python -m pytest -n 4 entityservice/tests --junitxml=testResults.xml -x"
depends_on:
- db
- redis
Expand Down