[2/2] KVM test: Update ctcs run on guests

Commit Message

Lucas Meneghel Rodrigues May 3, 2011, 6 a.m. UTC

Just update the config file and the control file that
is supposed to run on guests.

Signed-off-by: Lucas Meneghel Rodrigues <[e-mail]>
---
 client/tests/kvm/autotest_control/cerberus.control |   20 --------------------
 client/tests/kvm/autotest_control/ctcs.control     |   19 +++++++++++++++++++
 client/tests/kvm/tests_base.cfg.sample             |    4 ++--
 3 files changed, 21 insertions(+), 22 deletions(-)
 delete mode 100644 client/tests/kvm/autotest_control/cerberus.control
 create mode 100644 client/tests/kvm/autotest_control/ctcs.control

Patch

diff --git a/client/tests/kvm/autotest_control/cerberus.control b/client/tests/kvm/autotest_control/cerberus.control
deleted file mode 100644
index 5a828f0..0000000
--- a/client/tests/kvm/autotest_control/cerberus.control
+++ /dev/null
@@ -1,20 +0,0 @@ 
-AUTHOR = """
-Manas Kumar Nayak ([e-mail]) (original code)
-Lucas Meneghel Rodrigues ([e-mail]) (rewrite)
-Cao, Chen <[e-mail]> (use ctcs2 and port it to 64)
-"""
-NAME = "Cerberus test suite"
-TEST_TYPE = "CLIENT"
-TEST_CLASS = "HARDWARE"
-TEST_CATEGORY = "BENCHMARK"
-TIME = "MEDIUM"
-DOC = """\
-Executes the cerberus test for a period of time specified. You
-can also provide a cerberus test control file of your own, trough the parameter
-tcf_contents.
-
-see http://sourceforge.net/projects/ctcs2
-    and http://sourceforge.net/projects/va-ctcs
-"""
-
-job.run_test(url='cerberus', length='1h', tc_opt='-k -C -a')
diff --git a/client/tests/kvm/autotest_control/ctcs.control b/client/tests/kvm/autotest_control/ctcs.control
new file mode 100644
index 0000000..c105344
--- /dev/null
+++ b/client/tests/kvm/autotest_control/ctcs.control
@@ -0,0 +1,19 @@ 
+AUTHOR = """
+Manas Kumar Nayak ([e-mail]) (original code)
+Lucas Meneghel Rodrigues ([e-mail]) (rewrite)
+Cao, Chen <[e-mail]> (use ctcs2 and port it to 64)
+Lucas Meneghel Rodrigues ([e-mail]) (use ctcs new source repo)
+"""
+NAME = "CTCS"
+TEST_TYPE = "CLIENT"
+TEST_CLASS = "HARDWARE"
+TEST_CATEGORY = "BENCHMARK"
+TIME = "MEDIUM"
+DOC = """
+Executes CTCS for a period of time specified. You can also provide a cerberus
+test control file of your own, trough the parameter tcf_contents.
+
+see https://github.com/autotest/ctcs
+"""
+
+job.run_test(url='ctcs', length='1h', tc_opt='-k -C -a')
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index d3597b4..3b69b37 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -233,11 +233,11 @@  variants:
                 test_control_file = stress.control
             - disktest:
                 test_control_file = disktest.control
-            - ctcs2:
+            - ctcs:
                 # If you think this is too lengthy, please change the cerberus
                 # control file and set this timeout appropriately.
                 test_timeout = 3900
-                test_control_file = cerberus.control
+                test_control_file = ctcs.control
             - npb:
                 test_control_file = npb.control
             - hackbench: