qa/suites: use "mimic" branch for cbt based testing

cbt is using features like the f string introduced by python3.6, so we
need either stop testing on ubuntu 16.04, which came with python3.5, or
specify the a cbt branch which support python3.5. to address this issue
once and for all, it's simpler just pin the branch to "mimic" when
performing cbt based tests.

this change is not cherry-picked from master, as in master, we only
tests on distros which offers python3.6 and up.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/qa/suites/perf-basic/workloads/cosbench_64K_write.yaml b/qa/suites/perf-basic/workloads/cosbench_64K_write.yaml
index 1dbeef4a891ed6d2dc8d6379bcf9405118375ff1..f6f23a13d73eb42ae1d6bd283b5df7f201e82cc5 100644 (file)
--- a/qa/suites/perf-basic/workloads/cosbench_64K_write.yaml
+++ b/qa/suites/perf-basic/workloads/cosbench_64K_write.yaml
@@ -9,6 +9,7 @@ overrides:
     index_pool_pg_size: 64
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       cosbench:
         obj_size: [64KB]

diff --git a/qa/suites/perf-basic/workloads/fio_4K_rand_write.yaml b/qa/suites/perf-basic/workloads/fio_4K_rand_write.yaml
index 0b1c492b8de1be44a1dc62f376eb569dd364a1a4..56826e06ed96129d54434869ea00ea0b402934ae 100644 (file)
--- a/qa/suites/perf-basic/workloads/fio_4K_rand_write.yaml
+++ b/qa/suites/perf-basic/workloads/fio_4K_rand_write.yaml
@@ -5,6 +5,7 @@ meta:
 
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       librbdfio:
         op_size: [4096]

diff --git a/qa/suites/perf-basic/workloads/radosbench_4K_write.yaml b/qa/suites/perf-basic/workloads/radosbench_4K_write.yaml
index d0a825bf5be1999374ad906dfd1e65ccc18923ee..5fe3aed302fdbdb8da0b3174ecd4e1141100c57b 100644 (file)
--- a/qa/suites/perf-basic/workloads/radosbench_4K_write.yaml
+++ b/qa/suites/perf-basic/workloads/radosbench_4K_write.yaml
@@ -5,6 +5,7 @@ meta:
 
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       radosbench:
         concurrent_ops: 4

diff --git a/qa/suites/rados/perf/workloads/cosbench_64K_read_write.yaml b/qa/suites/rados/perf/workloads/cosbench_64K_read_write.yaml
index ff0662627cf489114e4d517354faac31967c71be..dd58a48e6f44bc268ff00b3f296fdff9fa8f401d 100644 (file)
--- a/qa/suites/rados/perf/workloads/cosbench_64K_read_write.yaml
+++ b/qa/suites/rados/perf/workloads/cosbench_64K_read_write.yaml
@@ -4,6 +4,7 @@ overrides:
     index_pool_pg_size: 64
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       cosbench:
         obj_size: [64KB]

diff --git a/qa/suites/rados/perf/workloads/cosbench_64K_write.yaml b/qa/suites/rados/perf/workloads/cosbench_64K_write.yaml
index 39034a03b9e91f0a1f73294f1e367d8c5eba917e..6f3563488b1c00e0e07dcc1a6ad9126d5e8d2f1c 100644 (file)
--- a/qa/suites/rados/perf/workloads/cosbench_64K_write.yaml
+++ b/qa/suites/rados/perf/workloads/cosbench_64K_write.yaml
@@ -4,6 +4,7 @@ overrides:
     index_pool_pg_size: 64
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       cosbench:
         obj_size: [64KB]

diff --git a/qa/suites/rados/perf/workloads/fio_4K_rand_read.yaml b/qa/suites/rados/perf/workloads/fio_4K_rand_read.yaml
index d5ef33ab317522d2cbb292fd2bbc439e1335179e..f34293400cfeb546735cd66a0e2aa227fb548007 100644 (file)
--- a/qa/suites/rados/perf/workloads/fio_4K_rand_read.yaml
+++ b/qa/suites/rados/perf/workloads/fio_4K_rand_read.yaml
@@ -1,5 +1,6 @@
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       librbdfio:
         op_size: [4096]

diff --git a/qa/suites/rados/perf/workloads/fio_4K_rand_rw.yaml b/qa/suites/rados/perf/workloads/fio_4K_rand_rw.yaml
index 14d43f143cb3afe75b4258c59260426416fb830b..a8f7ce6b4ebd50017ea449535f3d37058f225bfb 100644 (file)
--- a/qa/suites/rados/perf/workloads/fio_4K_rand_rw.yaml
+++ b/qa/suites/rados/perf/workloads/fio_4K_rand_rw.yaml
@@ -1,5 +1,6 @@
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       librbdfio:
         op_size: [4096]

diff --git a/qa/suites/rados/perf/workloads/fio_4M_rand_read.yaml b/qa/suites/rados/perf/workloads/fio_4M_rand_read.yaml
index b07432243e22ff816cc2fb98a0e2bc8daf07963d..c26a464b91d32f6b4d5168d321d1492ebb63a52b 100644 (file)
--- a/qa/suites/rados/perf/workloads/fio_4M_rand_read.yaml
+++ b/qa/suites/rados/perf/workloads/fio_4M_rand_read.yaml
@@ -1,5 +1,6 @@
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       librbdfio:
         op_size: [4194304]

diff --git a/qa/suites/rados/perf/workloads/fio_4M_rand_rw.yaml b/qa/suites/rados/perf/workloads/fio_4M_rand_rw.yaml
index 5fd6e2877e608cc1f0881b811f1093cdba186703..74e1d013de453ac7e1452e559b2e8079a9a7465a 100644 (file)
--- a/qa/suites/rados/perf/workloads/fio_4M_rand_rw.yaml
+++ b/qa/suites/rados/perf/workloads/fio_4M_rand_rw.yaml
@@ -1,5 +1,6 @@
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       librbdfio:
         op_size: [4194304]

diff --git a/qa/suites/rados/perf/workloads/fio_4M_rand_write.yaml b/qa/suites/rados/perf/workloads/fio_4M_rand_write.yaml
index 2d9d836110279c35ac140a7c65eb20157c774d9f..6ce82ffcc39f718ce3885037cfd6f4025248a98a 100644 (file)
--- a/qa/suites/rados/perf/workloads/fio_4M_rand_write.yaml
+++ b/qa/suites/rados/perf/workloads/fio_4M_rand_write.yaml
@@ -1,5 +1,6 @@
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       librbdfio:
         op_size: [4194304]

diff --git a/qa/suites/rados/perf/workloads/radosbench_4K_rand_read.yaml b/qa/suites/rados/perf/workloads/radosbench_4K_rand_read.yaml
index f1de9b41b4ef36ee0aa2b79e1a686a5ea06a3931..91250f072f9d0d876be863d3c20db91a2000c6f5 100644 (file)
--- a/qa/suites/rados/perf/workloads/radosbench_4K_rand_read.yaml
+++ b/qa/suites/rados/perf/workloads/radosbench_4K_rand_read.yaml
@@ -1,5 +1,6 @@
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       radosbench:
         concurrent_ops: 4

diff --git a/qa/suites/rados/perf/workloads/radosbench_4K_seq_read.yaml b/qa/suites/rados/perf/workloads/radosbench_4K_seq_read.yaml
index 8fb204a2f59614e4f1eddc87bc23ff9031e5e45a..6cc87518d09f98a40e053b48302a174c0a398ef5 100644 (file)
--- a/qa/suites/rados/perf/workloads/radosbench_4K_seq_read.yaml
+++ b/qa/suites/rados/perf/workloads/radosbench_4K_seq_read.yaml
@@ -1,5 +1,6 @@
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       radosbench:
         concurrent_ops: 4

diff --git a/qa/suites/rados/perf/workloads/radosbench_4M_rand_read.yaml b/qa/suites/rados/perf/workloads/radosbench_4M_rand_read.yaml
index cc1c744890203f31a203977d724b0bb8f3f0d2e8..6de5f718234e73c1b81b2e68f0f82b7884021650 100644 (file)
--- a/qa/suites/rados/perf/workloads/radosbench_4M_rand_read.yaml
+++ b/qa/suites/rados/perf/workloads/radosbench_4M_rand_read.yaml
@@ -1,5 +1,6 @@
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       radosbench:
         concurrent_ops: 4

diff --git a/qa/suites/rados/perf/workloads/radosbench_4M_seq_read.yaml b/qa/suites/rados/perf/workloads/radosbench_4M_seq_read.yaml
index 3ab55cf51d1e894e02f0489602234019e2496ea8..9376de2e2ef08ea770b6392999f8c671ed164efb 100644 (file)
--- a/qa/suites/rados/perf/workloads/radosbench_4M_seq_read.yaml
+++ b/qa/suites/rados/perf/workloads/radosbench_4M_seq_read.yaml
@@ -1,5 +1,6 @@
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       radosbench:
         concurrent_ops: 4

diff --git a/qa/suites/rados/perf/workloads/radosbench_4M_write.yaml b/qa/suites/rados/perf/workloads/radosbench_4M_write.yaml
index f6a5d715cc7e014694c8431d650042d3242695bf..495001985f7f2a8f8ee2cb358c07355091442a6a 100644 (file)
--- a/qa/suites/rados/perf/workloads/radosbench_4M_write.yaml
+++ b/qa/suites/rados/perf/workloads/radosbench_4M_write.yaml
@@ -1,5 +1,6 @@
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       radosbench:
         concurrent_ops: 4

diff --git a/qa/suites/rados/perf/workloads/sample_fio.yaml b/qa/suites/rados/perf/workloads/sample_fio.yaml
index 98411392d6d58dd5d8a9947f9691862eefd689b6..56fe7521b843e7c6f710d3a998be060da9297892 100644 (file)
--- a/qa/suites/rados/perf/workloads/sample_fio.yaml
+++ b/qa/suites/rados/perf/workloads/sample_fio.yaml
@@ -1,5 +1,6 @@
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       librbdfio:
         op_size: [4096]

diff --git a/qa/suites/rados/perf/workloads/sample_radosbench.yaml b/qa/suites/rados/perf/workloads/sample_radosbench.yaml
index e3dc47ae6f1c5bb029cd27bcbc79a5f2fbf68837..5dacd253a86e87cb66ee0fdbc9f56a847fba704d 100644 (file)
--- a/qa/suites/rados/perf/workloads/sample_radosbench.yaml
+++ b/qa/suites/rados/perf/workloads/sample_radosbench.yaml
@@ -1,5 +1,6 @@
 tasks:
 - cbt:
+    branch: 'mimic'
     benchmarks:
       radosbench:
         concurrent_ops: 4