Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

kypo-sandbox-service
- Activity
- Members
- Terraform modules

Snippets Groups Projects

13da6f85

Commit 13da6f85 authored 3 years ago by Michal Urban

Downloads
- Plain Diff

Merge branch 'develop' into 'master'

Merge Develop to Master

See merge request muni-kypo-crp/backend-python/kypo-sandbox-service!237

parents 14e7388b 9e7fbfe6

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

Pipfile 1 addition, 1 deletion

Pipfile
Pipfile.lock 115 additions, 106 deletions

Pipfile.lock
config.yml 10 additions, 5 deletions

config.yml
kypo/sandbox_ansible_app/lib/container.py 13 additions, 15 deletions

kypo/sandbox_ansible_app/lib/container.py
kypo/sandbox_common_lib/exc_handler.py 3 additions, 3 deletions

kypo/sandbox_common_lib/exc_handler.py
kypo/sandbox_common_lib/kypo_config.py 4 additions, 2 deletions

kypo/sandbox_common_lib/kypo_config.py
kypo/sandbox_definition_app/lib/definitions.py 9 additions, 0 deletions

kypo/sandbox_definition_app/lib/definitions.py
kypo/sandbox_instance_app/lib/pools.py 1 addition, 0 deletions

kypo/sandbox_instance_app/lib/pools.py
kypo/sandbox_instance_app/lib/request_handlers.py 7 additions, 3 deletions

kypo/sandbox_instance_app/lib/request_handlers.py
kypo/sandbox_instance_app/lib/stage_handlers.py 7 additions, 4 deletions

kypo/sandbox_instance_app/lib/stage_handlers.py
kypo/sandbox_service_project/tests/assets/template.yml 0 additions, 85 deletions

kypo/sandbox_service_project/tests/assets/template.yml
kypo/sandbox_service_project/tests/config.yml 15 additions, 5 deletions

kypo/sandbox_service_project/tests/config.yml
kypo/sandbox_service_project/tests/conftest.py 0 additions, 9 deletions

kypo/sandbox_service_project/tests/conftest.py
kypo/sandbox_service_project/tests/test_integration.py 39 additions, 69 deletions

kypo/sandbox_service_project/tests/test_integration.py

with 224 additions and 307 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment