Skip to content
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

Fix jobs workflow #36

Merged
merged 2 commits into from
Oct 20, 2022
Merged

Fix jobs workflow #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
704dc0a
monitor: allow missing workflow file in active job list
bertsky Oct 20, 2022
a81fd7f
make test: use same private key if running locally
bertsky Oct 20, 2022
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
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ test: test-production test-presentation
# run synchronous (without ActiveMQ)
test-production: $(DATA)/testdata-production
ifeq ($(NETWORK),bridge)
ssh -Tn -p $(PORT) ocrd@localhost for_production.sh --proc-id 1 --lang deu --script Fraktur $(<F)
ssh -i $(PRIVATE) -Tn -p $(PORT) ocrd@localhost for_production.sh --proc-id 1 --lang deu --script Fraktur $(<F)
else
docker exec -t -u ocrd `docker container ls -qf name=ocrd-manager` for_production.sh --proc-id 1 --lang deu --script Fraktur $(<F)
endif
Expand All @@ -99,13 +99,13 @@ endif

test-presentation: $(DATA)/testdata-presentation
ifeq ($(NETWORK),bridge)
ssh -Tn -p $(PORT) ocrd@localhost for_presentation.sh --pages PHYS_0017..PHYS_0021 --img-grp ORIGINAL $(<F)/mets.xml
ssh -i $(PRIVATE) -Tn -p $(PORT) ocrd@localhost for_presentation.sh --pages PHYS_0017..PHYS_0021 --img-grp ORIGINAL $(<F)/mets.xml
else
docker exec -t -u ocrd `docker container ls -qf name=ocrd-manager` for_presentation.sh --pages PHYS_0017..PHYS_0021 --img-grp ORIGINAL $(<F)/mets.xml
endif
diff -u <(docker run --rm -v $(DATA):/data $(TAGNAME) ocrd workspace -d $(<F) find -G FULLTEXT -g PHYS_0017..PHYS_0021) <(for file in FULLTEXT/FULLTEXT_00{17..21}.xml; do echo $$file; done)

clean:
clean clean-testdata:
$(RM) -r $(DATA)/testdata* $(DATA)/ocr-d/testdata*

.PHONY: build build-monitor run run-monitor help test test-production test-presentation clean
.PHONY: build build-monitor run run-monitor help test test-production test-presentation clean clean-testdata
2 changes: 1 addition & 1 deletion ocrd_monitor/flask/app/templates/jobs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h2 class="title">Active Jobs</h2>
<tr>
<td>{{ job.task.id }}</td>
<td>{{ job.process.id }}</td>
<td><a href="{{ url_for('workflow.detail', path=job.workflow.path) }}">{{ job.workflow.name }}</a></td>
<td>{% if job.workflow is defined %}<a href="{{ url_for('workflow.detail', path=job.workflow.path) }}">{{ job.workflow.name }}</a>{% endif %}</td>
<td>{{ job.pid }}</td>
<td>{{ job.status }}</td>
<td>{{ job.cpuutil }}</td>
Expand Down