engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hooks: pass in store_path into env for hooks.

Browse source
This commit is contained in:
Marcin Kuzminski 2018-09-26 12:14:37 +02:00
parent 5653c130c7
commit 3a43ded6b6
7 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rhodecode/apps/ssh_support/lib/backends/base.py
View file

@ -103,6 +103,7 @@ class VcsServer(object):
'repository': self.repo_name,
'scm': self.backend,
'config': self.ini_path,
'repo_store': self.store,
'make_lock': None,
'locked_by': [None, None],
'server_url': None,

3
rhodecode/apps/ssh_support/tests/test_server_git.py
View file

@ -121,6 +121,8 @@ class TestGitServer(object):
])
def test_update_environment(self, git_server, repo_mode, action):
server = git_server.create(repo_mode=repo_mode)
store = server.store
with mock.patch('os.environ', {'SSH_CLIENT': '10.10.10.10 b'}):
with mock.patch('os.putenv') as putenv_mock:
server.update_environment(action)
@ -135,6 +137,7 @@ class TestGitServer(object):
'ip': '10.10.10.10',
'locked_by': [None, None],
'config': '',
'repo_store': store,
'server_url': None,
'hooks': ['push', 'pull'],
'is_shadow_repo': False,

8
rhodecode/lib/base.py
View file

@ -180,7 +180,12 @@ def vcs_operation_context(
ui_settings = settings_model.get_ui_settings()
# NOTE(marcink): This should be also in sync with
# rhodecode/apps/ssh_support/lib/backends/base.py:update_enviroment scm_data
# rhodecode/apps/ssh_support/lib/backends/base.py:update_environment scm_data
store = [x for x in ui_settings if x.key == '/']
repo_store = ''
if store:
repo_store = store[0].value
scm_data = {
'ip': get_ip_addr(environ),
'username': username,
@ -189,6 +194,7 @@ def vcs_operation_context(
'repository': repo_name,
'scm': scm,
'config': rhodecode.CONFIG['__file__'],
'repo_store': repo_store,
'make_lock': make_lock,
'locked_by': locked_by,
'server_url': utils2.get_server_url(environ),

1
rhodecode/tests/events/test_repo.py
View file

@ -42,6 +42,7 @@ def scm_extras(user_regular, repo_stub):
'repository': repo_stub.repo_name,
'scm': repo_stub.scm_instance().alias,
'config': '',
'repo_store': '',
'server_url': 'http://example.com',
'make_lock': None,
'user-agent': 'some-client',

1
rhodecode/tests/integrations/conftest.py
View file

@ -43,6 +43,7 @@ def repo_push_event(backend, user_regular):
'repository': repo.repo_name,
'scm': repo.scm_instance().alias,
'config': '',
'repo_store': '',
'server_url': 'http://example.com',
'make_lock': None,
'locked_by': [None],

1
rhodecode/tests/lib/test_hooks_base.py
View file

@ -70,6 +70,7 @@ def hook_extras(user_regular, repo_stub):
'repository': repo_stub.repo_name,
'scm': '',
'config': '',
'repo_store': '',
'server_url': 'http://example.com',
'make_lock': None,
'user_agent': 'some-client',

1
rhodecode/tests/models/test_pullrequest.py
View file

@ -471,6 +471,7 @@ def merge_extras(user_regular):
'repository': 'fake_target_repo_name',
'scm': 'git',
'config': 'fake_config_ini_path',
'repo_store': '',
'make_lock': None,
'locked_by': [None, None, None],
'server_url': 'http://test.example.com:5000',