[mock_uss] Use docker compose for mock systems #170
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
barroco
approved these changes
Aug 22, 2023
| @@ -17,7 +17,7 @@ | |||
|
|
|||
| TIMEOUTS = (5, 5) # Timeouts of `connect` and `read` in seconds | |||
| ATTEMPTS = ( | |||
| 2 # Number of attempts to query when experiencing a retryable error like a timeout | |||
| 5 # Number of attempts to query when experiencing a retryable error like a timeout | |||
There was a problem hiding this comment.
Out of curiosity, was the previous configuration blocking the ci tests to pass?
There was a problem hiding this comment.
This was a simultaneous change to #172 and 5 retries is probably not helpful -- I'll revert before merging.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, we have a bunch of separate scripts to start up mock_uss in various configurations, but most of them are required in order to run baseline uss_qualifier tests, so we have complicated orchestration to manage all the mock_uss containers individually. docker compose is a much better fit for this task, so this PR replaces most of mock_uss's run_locally_xxx.sh with a system based on docker compose, with a single definition in docker-compose.yaml (in mock_uss) -- this is similar to how the interoperability ecosystem infrastructure is managed.
Also, we currently connect all containers on a local UTM deployment by routing their traffic out to specific ports on the host machine, and then back into the correct container via that external port. #28 could possibly be due to traffic exiting and then re-entering the docker internal network, so routing traffic directly within the docker network could possibly improve this problem. The docker compose configuration in this PR changes the mock_uss container configurations to:
scdsc.uss1.localutmversushost.docker.internal:8074)interop_ecosystem_network) and address each other via the hostnames on that networkThe local interoperability ecosystem infrastructure is also adjusted according to the above.
atproxy and atproxy_client are entirely disabled from the standard mock_uss deployment.