Rfaulk has uploaded a new change for review. https://gerrit.wikimedia.org/r/91349
Change subject: add - test repo and key path config to git config. ...................................................................... add - test repo and key path config to git config. Change-Id: Ib83603a531aa5ef642dcc4aa25e7a352edc93e55 --- M sartoris/config.py D sartoris/config_local.py.generic M scripts/sartoris.ini 3 files changed, 6 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/sartoris refs/changes/49/91349/1 diff --git a/sartoris/config.py b/sartoris/config.py index 249810c..b2ab7b6 100644 --- a/sartoris/config.py +++ b/sartoris/config.py @@ -58,6 +58,8 @@ 34: 'git log failed. Exiting.', 35: 'Revert failed, could not find tag. Exiting.', 36: 'Not enough tags (<2) to revert on. Exiting.', + 37: 'Missing system configuration item "key-path". Exiting.', + 38: 'Missing system configuration item "test-repo-path". Exiting.', 40: 'Failed to run sync script. Exiting.', 50: 'Failed to read the .deploy file. Exiting.', 60: 'Invalid git deploy action. Exiting.', @@ -131,6 +133,8 @@ 'client_path': ('deploy', 'client-path', 19), 'user.name': ('user', 'name', 28), 'user.email': ('user', 'email', 29), + 'deploy.key_path': ('deploy', 'key-path', 37), + 'deploy.test_repo': ('deploy', 'test-repo-path', 38), } # Assign the values of each git config element diff --git a/sartoris/config_local.py.generic b/sartoris/config_local.py.generic deleted file mode 100644 index 68b294d..0000000 --- a/sartoris/config_local.py.generic +++ /dev/null @@ -1,12 +0,0 @@ -""" -Local settings go in here -""" - -# REPO for Sartoris tests -TEST_REPO = '/path/to/test_repo/home/' - -# Path to private key -PKEY = '/path/to/private/key/file' - -# Project Path -PROJECT_HOME = '/path/to/sartoris' \ No newline at end of file diff --git a/scripts/sartoris.ini b/scripts/sartoris.ini index 07b790d..df74d24 100644 --- a/scripts/sartoris.ini +++ b/scripts/sartoris.ini @@ -12,5 +12,7 @@ remote= branch= client-path= +key-path= +test-repo-path= [system] run_root=/usr/bin/ \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/91349 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib83603a531aa5ef642dcc4aa25e7a352edc93e55 Gerrit-PatchSet: 1 Gerrit-Project: sartoris Gerrit-Branch: master Gerrit-Owner: Rfaulk <rfaulk...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits