qa/suites: use "nautilus" 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 "nautilus" 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..ebdb6d71a0c83be636a42f9acfda8d9a15334bec 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: 'nautilus'
     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..a660ac5a336681225fd1dbb1aca66a1c935a574e 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: 'nautilus'
     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..93c01792293eb1c26e3f480fcd621f17fa06fd4a 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: 'nautilus'
     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..e5bad129bece2adbcbc64d54c0e3ad86494aefe1 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: 'nautilus'
     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..81973da288472820a3e5555db97dda83435a9587 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: 'nautilus'
     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..61fdb5a93f416c35e186b5c84b9588210e906f3f 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: 'nautilus'
     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..9de8196b5d0361a370237fdf198a7c8ac020f213 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: 'nautilus'
     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..f64e9bb894dc1831f4ad8876d21558ce45c62179 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: 'nautilus'
     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..369fb268303d20386c3645af79d91ab713dce65c 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: 'nautilus'
     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..2ac8ef9e0087c3d90bebc2d803060b266f94021a 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: 'nautilus'
     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..420f19504fbadcb0463b5ab90fca76f794c83106 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: 'nautilus'
     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..e32cabaa2b28156929fde6b417e75efb1190ba7f 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: 'nautilus'
     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..27b2466a800eec0d6ad4a19c501a59721c5b25f1 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: 'nautilus'
     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..a7107d8584e165355e0afeef2deaa369f3bc1ff8 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: 'nautilus'
     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..0465e12448b384a18121c7522dbc420483ddd78f 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: 'nautilus'
     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..c4bb2422bde025761b85b6a0114a6aee6151e959 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: 'nautilus'
     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..9d9f0ac296f75629209defa2b8efb5ee056211f1 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: 'nautilus'
     benchmarks:
       radosbench:
         concurrent_ops: 4