From d480e8746512caf8821c42582e7ab75d25b3127b Mon Sep 17 00:00:00 2001 From: mbeierl Date: Thu, 5 Nov 2015 21:22:54 -0500 Subject: Adding Heat template for staging StorPerf master node Change-Id: I1e55290013f31272952f23869a02d68ca08cd4a7 JIRA: STORPERF-12 Signed-off-by: mbeierl --- ci/merge.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'ci/merge.sh') 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 . -- cgit 1.2.3-korg