-
Notifications
You must be signed in to change notification settings - Fork 17
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.
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
Makefile-test for ocrd-network #407
Draft
joschrew
wants to merge
8
commits into
master
Choose a base branch
from
docker-tests
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
0d9bf0e
Add test for ocrd network
joschrew 78ae4fe
Update network test: change core image usage
joschrew 4b6bb36
Use volume from core for ocrd_all docker tests
joschrew 807f983
Update cis, segment and tesserocr to latest
joschrew 56ee829
Update ocrd_all-test-docker-compose
joschrew 0e3e74c
Fix cis-image-usage in ocrd_all-test-dockercompose
joschrew 95b1e5f
Update network test docker-compose
joschrew 1b7a9af
Update network tests in regard to related core pr
joschrew File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Submodule core
updated
35 files
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,181 @@ | ||
| services: | ||
| ocrd_network_processing_server: | ||
| image: processing-server | ||
| build: | ||
| context: ../../../core | ||
joschrew marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| target: ocrd_core_base | ||
|
|
||
| ocrd_network_core_test: | ||
| build: | ||
| context: ../../../core | ||
| args: | ||
| SKIP_ASSETS: 1 | ||
|
|
||
| ocrd-olena-binarize: | ||
| build: | ||
| context: ../../../ocrd_olena | ||
| container_name: ocrd-olena-binarize | ||
joschrew marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| depends_on: | ||
| ocrd_network_processing_server: | ||
| condition: service_healthy | ||
| networks: | ||
| - ${DOCKER_OCRD_NETWORK_NAME} | ||
| environment: | ||
| - OCRD_NETWORK_LOGS_ROOT_DIR=/ocrd-data/ocrd_network_logs | ||
| - OCRD_LOGGING_DEBUG=true | ||
| volumes: | ||
| - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs | ||
| - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets | ||
| - ${OCRD_NETWORK_DATA}:/data | ||
| command: ocrd-olena-binarize worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL} | ||
|
|
||
|
|
||
| ocrd-anybaseocr-crop: | ||
| build: | ||
| context: ../../../ocrd_anybaseocr | ||
| container_name: ocrd-anybaseocr-crop | ||
| depends_on: | ||
| ocrd_network_processing_server: | ||
| condition: service_healthy | ||
| networks: | ||
| - ${DOCKER_OCRD_NETWORK_NAME} | ||
| environment: | ||
| - OCRD_NETWORK_LOGS_ROOT_DIR=/ocrd-data/ocrd_network_logs | ||
| - OCRD_LOGGING_DEBUG=true | ||
| volumes: | ||
| - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs | ||
| - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets | ||
| - ${OCRD_NETWORK_DATA}:/data | ||
| command: ocrd-anybaseocr-crop worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL} | ||
|
|
||
|
|
||
| ocrd-cis-ocropy-denoise: | ||
| build: | ||
| context: ../../../ocrd_cis | ||
| container_name: ocrd-cis-ocropy-denoise | ||
joschrew marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| depends_on: | ||
| ocrd_network_processing_server: | ||
| condition: service_healthy | ||
| networks: | ||
| - ${DOCKER_OCRD_NETWORK_NAME} | ||
| environment: | ||
| - OCRD_NETWORK_LOGS_ROOT_DIR=/ocrd-data/ocrd_network_logs | ||
| - OCRD_LOGGING_DEBUG=true | ||
| volumes: | ||
| - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs | ||
| - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets | ||
| - ${OCRD_NETWORK_DATA}:/data | ||
| command: ocrd-cis-ocropy-denoise worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL} | ||
|
|
||
|
|
||
| ocrd-cis-ocropy-clip: | ||
| build: | ||
| context: ../../../ocrd_cis | ||
| container_name: ocrd-cis-ocropy-clip | ||
joschrew marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| depends_on: | ||
| ocrd_network_processing_server: | ||
| condition: service_healthy | ||
| networks: | ||
| - ${DOCKER_OCRD_NETWORK_NAME} | ||
| environment: | ||
| - OCRD_NETWORK_LOGS_ROOT_DIR=/ocrd-data/ocrd_network_logs | ||
| - OCRD_LOGGING_DEBUG=true | ||
| volumes: | ||
| - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs | ||
| - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets | ||
| - ${OCRD_NETWORK_DATA}:/data | ||
| command: ocrd-cis-ocropy-clip worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL} | ||
|
|
||
|
|
||
| ocrd-cis-ocropy-segment: | ||
| build: | ||
| context: ../../../ocrd_cis | ||
| depends_on: | ||
joschrew marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ocrd_network_processing_server: | ||
| condition: service_healthy | ||
| networks: | ||
| - ${DOCKER_OCRD_NETWORK_NAME} | ||
| environment: | ||
| - OCRD_NETWORK_LOGS_ROOT_DIR=/ocrd-data/ocrd_network_logs | ||
| - OCRD_LOGGING_DEBUG=true | ||
| volumes: | ||
| - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs | ||
| - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets | ||
| - ${OCRD_NETWORK_DATA}:/data | ||
| command: ocrd-cis-ocropy-segment worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL} | ||
|
|
||
|
|
||
| ocrd-cis-ocropy-dewarp: | ||
| build: | ||
| context: ../../../ocrd_cis | ||
| container_name: ocrd-cis-ocropy-dewarp | ||
joschrew marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| depends_on: | ||
| ocrd_network_processing_server: | ||
| condition: service_healthy | ||
| networks: | ||
| - ${DOCKER_OCRD_NETWORK_NAME} | ||
| environment: | ||
| - OCRD_NETWORK_LOGS_ROOT_DIR=/ocrd-data/ocrd_network_logs | ||
| - OCRD_LOGGING_DEBUG=true | ||
| volumes: | ||
| - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs | ||
| - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets | ||
| - ${OCRD_NETWORK_DATA}:/data | ||
| command: ocrd-cis-ocropy-dewarp worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL} | ||
|
|
||
|
|
||
| ocrd-tesserocr-segment-region: | ||
| image: ocrd/tesserocr | ||
| container_name: ocrd-tesserocr-segment-region | ||
| depends_on: | ||
| ocrd_network_processing_server: | ||
| condition: service_healthy | ||
| networks: | ||
| - ${DOCKER_OCRD_NETWORK_NAME} | ||
| environment: | ||
| - TESSDATA_PREFIX=/usr/local/share/tessdata | ||
| - OCRD_NETWORK_LOGS_ROOT_DIR=/ocrd-data/ocrd_network_logs | ||
| - OCRD_LOGGING_DEBUG=true | ||
| volumes: | ||
| - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs | ||
| - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets | ||
| - ${OCRD_NETWORK_DATA}:/data | ||
| command: ocrd-tesserocr-segment-region worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL} | ||
|
|
||
|
|
||
| ocrd-tesserocr-recognize: | ||
| image: ocrd/tesserocr | ||
| container_name: ocrd-tesserocr-recognize | ||
| depends_on: | ||
| ocrd_network_processing_server: | ||
| condition: service_healthy | ||
| networks: | ||
| - ${DOCKER_OCRD_NETWORK_NAME} | ||
| environment: | ||
| - TESSDATA_PREFIX=/usr/local/share/tessdata | ||
| - OCRD_NETWORK_LOGS_ROOT_DIR=/ocrd-data/ocrd_network_logs | ||
| - OCRD_LOGGING_DEBUG=true | ||
| volumes: | ||
| - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs | ||
| - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets | ||
| - ${OCRD_NETWORK_DATA}:/data | ||
| command: ocrd-tesserocr-recognize worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL} | ||
|
|
||
|
|
||
| ocrd-segment-repair: | ||
| image: ocrd/segment | ||
| container_name: ocrd-segment-repair | ||
| depends_on: | ||
| ocrd_network_processing_server: | ||
| condition: service_healthy | ||
| networks: | ||
| - ${DOCKER_OCRD_NETWORK_NAME} | ||
| environment: | ||
| - OCRD_NETWORK_LOGS_ROOT_DIR=/ocrd-data/ocrd_network_logs | ||
| - OCRD_LOGGING_DEBUG=true | ||
| volumes: | ||
| - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs | ||
| - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets | ||
| - ${OCRD_NETWORK_DATA}:/data | ||
| command: ocrd-segment-repair worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL} | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We want failure of the test command in failure of the
make integration-testtarget, no?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On the CI/CD pipeline, yes. However, when testing locally, failed tests leave leftovers. Potentially, we need both versions?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But for that use-case we used to have the convention of passing a variable
PYTEST_ARGSwhere the user could insert things like--continue-on-collection-errors, right?