Skip to content
Snippets Groups Projects

Deploy ruqad in docker

Merged Daniel Hornung requested to merge f-deploy-in-docker into main
8 unresolved threads

Summary

A big merge request for everything. Maybe !3 (merged) should be merged first?

Focus

Can the Ruqad monitor be run in Docker?

Test Environment

Check the readme files.

Check List for the Author

Please, prepare your MR for a review. Be sure to write a summary and a focus and create gitlab comments for the reviewer. They should guide the reviewer through the changes, explain your changes and also point out open questions. For further good practices have a look at our review guidelines

  • All automated tests pass
  • Reference related issues caosdb/customers/f-fit/management#18
  • Up-to-date CHANGELOG.md (or not necessary)
  • Up-to-date JSON schema (or not necessary)
  • Appropriate user and developer documentation (or not necessary)
    • How do I use the software? Assume "stupid" users.
    • How do I develop or debug the software? Assume novice developers.
  • Annotations in code (Gitlab comments)
    • Intent of new code
    • Problems with old code
    • Why this implementation?

Check List for the Reviewer

  • I understand the intent of this MR
  • All automated tests pass
  • Up-to-date CHANGELOG.md (or not necessary)
  • Appropriate user and developer documentation (or not necessary)
  • The test environment setup works and the intended behavior is reproducible in the test environment
  • In-code documentation and comments are up-to-date.
  • Check: Are there specifications? Are they satisfied?

For further good practices have a look at our review guidelines.

Edited by Daniel Hornung

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Daniel Hornung marked the checklist item Check: Are there specifications? Are they satisfied? as incomplete

    marked the checklist item Check: Are there specifications? Are they satisfied? as incomplete

  • Daniel Hornung marked the checklist item In-code documentation and comments are up-to-date. as incomplete

    marked the checklist item In-code documentation and comments are up-to-date. as incomplete

  • Daniel Hornung marked the checklist item The test environment setup works and the intended behavior is reproducible in the test as incomplete

    marked the checklist item The test environment setup works and the intended behavior is reproducible in the test as incomplete

  • Daniel Hornung marked the checklist item Appropriate user and developer documentation (or not necessary) as incomplete

    marked the checklist item Appropriate user and developer documentation (or not necessary) as incomplete

  • Daniel Hornung marked the checklist item Up-to-date CHANGELOG.md (or not necessary) as incomplete

    marked the checklist item Up-to-date CHANGELOG.md (or not necessary) as incomplete

  • Daniel Hornung marked the checklist item All automated tests pass as incomplete

    marked the checklist item All automated tests pass as incomplete

  • Daniel Hornung marked the checklist item I understand the intent of this MR as incomplete

    marked the checklist item I understand the intent of this MR as incomplete

  • Daniel Hornung changed target branch from main to f-qualitycheck-trigger

    changed target branch from main to f-qualitycheck-trigger

  • assigned to @daniel

  • 6 7 COPY ./end-to-end-tests /ruqad/end-to-end-tests
    7 8 COPY ./pyproject.toml /ruqad/
    8 RUN cd /ruqad && pip install .
    9 CMD python -m ruqad.monitor
    9
    10 # static configuration
    11 COPY ./qualitycheck_config.toml /ruqad/
    12 COPY ./pylinkahead.ini /ruqad/
    13
    14 # Installing the package
    15 WORKDIR /ruqad/
    16 # TODO Remove this manual crawler installation after the crawler has been released in version 0.10.2
    17 RUN pip install --root-user-action=ignore \
    18 git+https://gitlab.indiscale.com/caosdb/src/caosdb-crawler.git@dev
    19
    20 RUN pip install --root-user-action=ignore .[all]
  • Daniel Hornung
  • 29 import sys
    28
    30 29 from time import sleep
    31 30 from tempfile import TemporaryDirectory
    32 31 from datetime import datetime, timezone
    33 32
    34 sys.path.append(os.path.dirname(__file__))
    35
    36 from .qualitycheck import QualityChecker # NOQA
    37 from .kadi import collect_records_created_after, download_eln_for # NOQA
    38 from .crawler import trigger_crawler # NOQA
    39 from kadi_apy import KadiManager # NOQA
    33 from ruqad.qualitycheck import QualityChecker
    34 from ruqad.kadi import collect_records_created_after, download_eln_for
    35 from ruqad.crawler import trigger_crawler
    36 from kadi_apy import KadiManager
  • 39 from kadi_apy import KadiManager # NOQA
    33 from ruqad.qualitycheck import QualityChecker
    34 from ruqad.kadi import collect_records_created_after, download_eln_for
    35 from ruqad.crawler import trigger_crawler
    36 from kadi_apy import KadiManager
    40 37
    41 38
    42 39 KADIARGS = {
    43 40 "host": os.environ['KADIHOST'],
    44 "pat": os.environ['KADITOKEN']
    41 "pat": os.environ['KADITOKEN'],
    45 42 }
    46 43
    47 44
    48 if __name__ == "__main__":
    45 def monitor():
  • .dockerignore 0 → 100644
  • 53 53 - python -m pytest end-to-end-tests/test_kadi.py
    54 54
    55 55
    56 unittest_py3.8:
  • added 1 commit

    Compare with previous version

  • Daniel Hornung marked the checklist item Annotations in code (Gitlab comments) as completed

    marked the checklist item Annotations in code (Gitlab comments) as completed

  • Daniel Hornung requested review from @salexan

    requested review from @salexan

  • added 1 commit

    • 86c43d7e - FIX: correct branch of crawler

    Compare with previous version

  • Daniel Hornung added 7 commits

    added 7 commits

    • 94219d66 - ENH: added datamodel needed for metadata validation
    • d0a78046 - ENH: added crawler extensions needed for the cfood
    • f505338f - MAINT: temporary false assertion
    • 265fc8ec - ENH: code for metadata validation in ruqad demonstrator
    • 5ca6576e - FIX: added type casts to cfood
    • c4ed885b - ENH: implemented metadata validation in crawler module
    • 92d2c013 - Merge remote-tracking branch 'origin/f-trigger-crawler' into f-deploy-in-docker

    Compare with previous version

  • added 1 commit

    • 6254abd8 - FIX: Handle Gitlab pipeline edge case.

    Compare with previous version

  • Daniel Hornung mentioned in merge request !3 (merged)

    mentioned in merge request !3 (merged)

  • Daniel Hornung added 2 commits

    added 2 commits

    • f7f85b58 - 1 commit from branch f-qualitycheck-trigger
    • 5c6e5aa4 - Merge branch 'f-qualitycheck-trigger' into f-deploy-in-docker

    Compare with previous version

  • Alexander Schlemmer
  • Alexander Schlemmer
  • Alexander Schlemmer
  • Alexander Schlemmer
  • 4 4
  • Timm Fitschen
  • added 1 commit

    • fc3e6751 - FIX: Fixed pipeline status check.

    Compare with previous version

  • Daniel Hornung added 2 commits

    added 2 commits

    • 4916e4e9 - 1 commit from branch main
    • 66eb6f7f - Merge branch 'dev' into f-deploy-in-docker

    Compare with previous version

  • added 1 commit

    • ba1506f4 - FIX: Correct argument for exception constructor

    Compare with previous version

  • added 1 commit

    • bebfa199 - MAINT: Updated crawler's branch name.

    Compare with previous version

  • added 3 commits

    • a13bf412 - Optional "s" in url for kadi repo
    • abee71f5 - TST: add return value and metadata validation output to crawler
    • 55eb267f - Merge branch 'f-trigger-crawler' into f-deploy-in-docker

    Compare with previous version

  • Daniel Hornung mentioned in commit 6a07f736

    mentioned in commit 6a07f736

  • Please register or sign in to reply
    Loading