Merge lp:~mreed8855/charms/trusty/autotest/custom_test into lp:~mreed8855/charms/trusty/autotest/trunk

[Michael Reed]

- Added the option to upload custom tests to the autotest/client/tests directory
- Updated the custom script in the actions directory to run the custom tests

Unmerged revisions

6. By Michael Reed on 2017-02-16

-Modified the "custom" script in the actions directory to take multiple test names
-added a config option to upload custom made tests for autotest. They will be uploaded into the
autotest/client/tests directory

=== modified file 'actions.yaml'
--- actions.yaml	2016-02-19 15:14:48 +0000
+++ actions.yaml	2017-02-16 15:57:24 +0000
@@ -1,5 +1,9 @@
 custom:
   description: "Custom Autobench tests"
+  params:
+    testnames:
+      type: string
+      description: "List specfic tests that do not have actions defined"
 dbench:
   description: A tool to generate I/O workloads to either a filesystem.
 stress:
 
=== modified file 'actions/custom'
--- actions/custom	2015-11-16 05:57:01 +0000
+++ actions/custom	2017-02-16 15:57:24 +0000
@@ -7,5 +7,5 @@
 
 . actions/benchmark
 
-params=`action-get tests`
+params=`action-get testnames`
 run_benchmark $params
 
=== modified file 'config.yaml'
--- config.yaml	2016-02-15 14:23:06 +0000
+++ config.yaml	2017-02-16 15:57:24 +0000
@@ -7,3 +7,7 @@
     type: string
     default: "git://kernel.ubuntu.com/ubuntu/autotest-client-tests"
     description: "Location of the autotest client testcases"
+  autotest-custom-tests:
+    type: string
+    default: "https://github.com/mreed8855/custom-tests.git"
+    description: "Location of the custom autotest client testcases"
 
=== modified file 'hooks/install'
--- hooks/install	2015-11-16 05:57:01 +0000
+++ hooks/install	2017-02-16 15:57:24 +0000
@@ -9,6 +9,9 @@
 
 AUTOTEST_SERVER=`config-get autotest-server`
 AUTOTEST_CLIENT=`config-get autotest-client`
+AUTOTEST_CUSTOM_TESTS=`config-get autotest-custom-tests`
+
+# CUSTOM_TESTS_DIR="custom-tests"
 
 LOG_FILE_STATUS="/tmp/upstart.log"
 
@@ -17,12 +20,21 @@
 
 git clone ${AUTOTEST_SERVER} 2>&1  | tee -a ${LOG_FILE_STATUS}
 git clone ${AUTOTEST_CLIENT} 2>&1  | tee -a ${LOG_FILE_STATUS}
+git clone  ${AUTOTEST_CUSTOM_TESTS} 2>&1  | tee -a ${LOG_FILE_STATUS}
+# if [ -z ${AUTOTEST_CUSTOM_TESTS} ]; then
+#   git clone  ${AUTOTEST_CUSTOM_TESTS} 2>&1  | tee -a ${LOG_FILE_STATUS}
+# fi
 
 # Set for Autotest server 
 export AUTODIR=$CHARM_DIR/.tmp/autotest/
 mkdir -p $CHARM_DIR/.tmp/autotest/
 mv autotest/* $CHARM_DIR/.tmp/autotest/
 mv autotest-client-tests/* $CHARM_DIR/.tmp/autotest/client/tests/
+mv custom-tests/* $CHARM_DIR/.tmp/autotest/client/tests/
+
+#if [ -d "CUSTOM_TESTS_DIR" ]; then
+#   mv custom-tests/* $CHARM_DIR/.tmp/autotest/client/tests/
+#fi
 
 # missing file for stress.py
 wget http://people.canonical.com/~mreed/autotest/utils_memory.py