From 2806ce0d16d6fce065b8962695a4e4de07dd00d3 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 3 Apr 2020 17:06:47 +0800 Subject: [PATCH] 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 --- qa/suites/perf-basic/workloads/cosbench_64K_write.yaml | 1 + qa/suites/perf-basic/workloads/fio_4K_rand_write.yaml | 1 + qa/suites/perf-basic/workloads/radosbench_4K_write.yaml | 1 + qa/suites/rados/perf/workloads/cosbench_64K_read_write.yaml | 1 + qa/suites/rados/perf/workloads/cosbench_64K_write.yaml | 1 + qa/suites/rados/perf/workloads/fio_4K_rand_read.yaml | 1 + qa/suites/rados/perf/workloads/fio_4K_rand_rw.yaml | 1 + qa/suites/rados/perf/workloads/fio_4M_rand_read.yaml | 1 + qa/suites/rados/perf/workloads/fio_4M_rand_rw.yaml | 1 + qa/suites/rados/perf/workloads/fio_4M_rand_write.yaml | 1 + qa/suites/rados/perf/workloads/radosbench_4K_rand_read.yaml | 1 + qa/suites/rados/perf/workloads/radosbench_4K_seq_read.yaml | 1 + qa/suites/rados/perf/workloads/radosbench_4M_rand_read.yaml | 1 + qa/suites/rados/perf/workloads/radosbench_4M_seq_read.yaml | 1 + qa/suites/rados/perf/workloads/radosbench_4M_write.yaml | 1 + qa/suites/rados/perf/workloads/sample_fio.yaml | 1 + qa/suites/rados/perf/workloads/sample_radosbench.yaml | 1 + 17 files changed, 17 insertions(+) diff --git a/qa/suites/perf-basic/workloads/cosbench_64K_write.yaml b/qa/suites/perf-basic/workloads/cosbench_64K_write.yaml index 1dbeef4a891ed..f6f23a13d73eb 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 0b1c492b8de1b..56826e06ed961 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 d0a825bf5be19..5fe3aed302fdb 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 ff0662627cf48..dd58a48e6f44b 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 39034a03b9e91..6f3563488b1c0 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 d5ef33ab31752..f34293400cfeb 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 14d43f143cb3a..a8f7ce6b4ebd5 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 b07432243e22f..c26a464b91d32 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 5fd6e2877e608..74e1d013de453 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 2d9d836110279..6ce82ffcc39f7 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 f1de9b41b4ef3..91250f072f9d0 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 8fb204a2f5961..6cc87518d09f9 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 cc1c744890203..6de5f718234e7 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 3ab55cf51d1e8..9376de2e2ef08 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 f6a5d715cc7e0..495001985f7f2 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 98411392d6d58..56fe7521b843e 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 e3dc47ae6f1c5..5dacd253a86e8 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 -- 2.39.5