From: Kefu Chai Date: Fri, 3 Apr 2020 09:06:47 +0000 (+0800) Subject: qa/suites: use "mimic" branch for cbt based testing X-Git-Tag: v13.2.9~3^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2806ce0d16d6fce065b8962695a4e4de07dd00d3;p=ceph.git 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 --- diff --git a/qa/suites/perf-basic/workloads/cosbench_64K_write.yaml b/qa/suites/perf-basic/workloads/cosbench_64K_write.yaml index 1dbeef4a891..f6f23a13d73 100644 --- 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 0b1c492b8de..56826e06ed9 100644 --- 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 d0a825bf5be..5fe3aed302f 100644 --- 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 ff0662627cf..dd58a48e6f4 100644 --- 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 39034a03b9e..6f3563488b1 100644 --- 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 d5ef33ab317..f34293400cf 100644 --- 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 14d43f143cb..a8f7ce6b4eb 100644 --- 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 b07432243e2..c26a464b91d 100644 --- 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 5fd6e2877e6..74e1d013de4 100644 --- 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 2d9d8361102..6ce82ffcc39 100644 --- 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 f1de9b41b4e..91250f072f9 100644 --- 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 8fb204a2f59..6cc87518d09 100644 --- 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 cc1c7448902..6de5f718234 100644 --- 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 3ab55cf51d1..9376de2e2ef 100644 --- 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 f6a5d715cc7..495001985f7 100644 --- 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 98411392d6d..56fe7521b84 100644 --- 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 e3dc47ae6f1..5dacd253a86 100644 --- 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