summaryrefslogtreecommitdiffstats
path: root/ci/merge.sh
AgeCommit message (Collapse)AuthorFilesLines
2016-02-05Developer build process fixMark Beierl1-1/+1
Fix the installation os setuptools so that it does not conflict with mock. Change-Id: I7c497d36c80a795fc99b329da2d171a265e4eacc JIRA: STORPERF-35 Signed-off-by: Mark Beierl <mark.beierl@emc.com> (cherry picked from commit fd4b99b086583bc8dc91950393ffed646f7eee59)
2016-01-29Switching merge job to virtualenvMark Beierl1-0/+16
Signed-off-by: Mark Beierl <mark.beierl@emc.com> (cherry picked from commit 9960601b321f10a11257832a2ecacb91acf03c53) Change-Id: I172499e216149b4afbc3eb22b42e126e51f9a59d
2015-11-23Adding workload modulesmbeierl1-1/+9
Adding the ablity to define workloads in modules which can be referenced from the API. Breaking out the test execution into its own class so it will be easier to support ReST or other interfaces. Added flake8 and code coverage reports where possible to merge and verify jobs Change-Id: Ieb51e4e7e1e989288a6f81f4757709669914a196 JIRA: STORPERF-21 Signed-off-by: mbeierl <mark.beierl@emc.com>
2015-11-05Adding Heat template for staging StorPerf master nodembeierl1-1/+10
Change-Id: I1e55290013f31272952f23869a02d68ca08cd4a7 JIRA: STORPERF-12 Signed-off-by: mbeierl <mark.beierl@emc.com>
2015-10-16Integration with RelengMark Beierl1-0/+2
Added verify, merge and daily jobs that will be called automatically by Gerrit/LF Jenkins on workflow change Change-Id: I3ae85593b6aeac4a1a7abb51354b9cc6fa1fd813 JIRA: RELENG-41 Signed-off-by: Mark Beierl <mark@jemms.net>