diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-04 17:43:23 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-04 17:43:23 +0000 |
| commit | 2145d16605406150a692fcf5df00970d57bdf2e1 (patch) | |
| tree | 02382982c9da829a80247cc8c4a510855c8ce83d /config.py | |
| parent | e116e7bbd15ae92ca057f32ea597618e9ca912e3 (diff) | |
| download | system-tests-2145d16605406150a692fcf5df00970d57bdf2e1.tar.gz | |
Update system-tests for current state of Baserock
Diffstat (limited to 'config.py')
| -rw-r--r-- | config.py | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -35,14 +35,13 @@ BOOT_TIMEOUT=20 # 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 = ['/src/morph/morph', '--no-git-update'] +MORPH_COMMAND = '/src/morph/morph' #MORPH_COMMAND = 'morph' BUILD_TEMPDIR = '/src/tmp' -#BRANCH = 'master' -BRANCH = 'baserock/sam/trove-upgrades' +BRANCH = 'master' # For debugging. FIXME: would be better if cliapp's logging mechanism supported # logging to stdout, but .... :( |