diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-05-21 16:59:33 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-05-21 16:59:33 +0000 |
| commit | 7575459b08a8fb3d28d416225617927ba12101d2 (patch) | |
| tree | c990ab3b70c10d2fc211b29b2e9b0f7cb5f26d2a | |
| parent | c65dacb946914340157c3072a0524f14e3e0fed0 (diff) | |
| download | system-tests-7575459b08a8fb3d28d416225617927ba12101d2.tar.gz | |
Clean up config
| -rw-r--r-- | config.py | 17 |
1 files changed, 6 insertions, 11 deletions
@@ -21,8 +21,8 @@ import socket # The test host must have passwordless access to this machine. The tests set # set StrictHostKeyChecking=no for SSH connections so it does not need to be in # '~/.ssh/known_hosts'. -DEPLOY_URL = 'kvm+ssh://sam@landfill.ducie.codethink.co.uk/' -DEPLOY_PATH = '/home/VIRT-IMAGES/' +DEPLOY_URL = 'kvm+ssh://root@extractor.dyn.ducie.codethink.co.uk/' +DEPLOY_PATH = '/var/lib/libvirt/images/' # This is the hostname and VM name of the machine that gets deployed. DEPLOY_NAME = 'brtests-%s' % (socket.gethostname()) @@ -31,18 +31,13 @@ DEPLOY_NAME = 'brtests-%s' % (socket.gethostname()) # boot or connect to network successfully. BOOT_TIMEOUT=20 -# FIXME: building should automatically use the version of Morph from the system -# branch, really ... but for now, if the installed Morph can't build -# baserock:baserock/morphs 'master' branch, you can change this! -os.environ['PYTHONPATH'] = '/src/morph' -MORPH_COMMAND = ['/src/morph/morph', '--no-git-update'] -#MORPH_COMMAND = '/src/morph/morph' -#MORPH_COMMAND = 'morph' +# Command to run for branch and merge commands, and distbuilding. You might +# want to use a custom version of Morph if you're developing a Morph feature. +MORPH_COMMAND = 'morph' BUILD_TEMPDIR = '/src/tmp' -#BRANCH = 'master' -BRANCH = 'baserock/sam/trove-configure' +BRANCH = 'master' # For debugging. FIXME: would be better if cliapp's logging mechanism supported # logging to stdout, but .... :( |