diff options
| author |   mbeierl <mark.beierl@emc.com> | 2015-11-05 21:22:54 -0500 |
|---|---|---|
| committer | mbeierl <mark.beierl@emc.com> | 2015-11-05 21:23:49 -0500 |
| commit | d480e8746512caf8821c42582e7ab75d25b3127b (patch) | |
| tree | 8c8e14162b06eca9a272a2593096c9a643e3b65c /ci/merge.sh | |
| parent | 11dd42eccfe25e3b5b950c52198fa9f8effc86be (diff) | |
Adding Heat template for staging StorPerf master node
Change-Id: I1e55290013f31272952f23869a02d68ca08cd4a7
JIRA: STORPERF-12
Signed-off-by: mbeierl <mark.beierl@emc.com>
Diffstat (limited to 'ci/merge.sh')
| -rwxr-xr-x | ci/merge.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ci/merge.sh b/ci/merge.sh index 06bd986..bd1d3fe 100755 --- a/ci/merge.sh +++ b/ci/merge.sh @@ -1,2 +1,11 @@ #!/bin/bash -exit 0 +############################################################################## +# Copyright (c) 2015 EMC and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +PYTHONPATH="`pwd`/storperf":"`pwd`/tests" nosetests --with-xunit . |