From: Kefu Chai Date: Fri, 3 Apr 2020 08:48:17 +0000 (+0800) Subject: qa/suites: use "nautilus" branch for cbt based testing X-Git-Tag: v14.2.10~124^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9fb43f37a51b1bed61a0b860a0889f688887ff5d;p=ceph.git 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 --- diff --git a/qa/suites/perf-basic/workloads/cosbench_64K_write.yaml b/qa/suites/perf-basic/workloads/cosbench_64K_write.yaml index 1dbeef4a891e..ebdb6d71a0c8 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: '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 0b1c492b8de1..a660ac5a3366 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: '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 d0a825bf5be1..93c01792293e 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: '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 ff0662627cf4..e5bad129bece 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: '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 39034a03b9e9..81973da28847 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: '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 d5ef33ab3175..61fdb5a93f41 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: '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 14d43f143cb3..9de8196b5d03 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: '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 b07432243e22..f64e9bb894dc 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: '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 5fd6e2877e60..369fb268303d 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: '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 2d9d83611027..2ac8ef9e0087 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: '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 f1de9b41b4ef..420f19504fba 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: '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 8fb204a2f596..e32cabaa2b28 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: '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 cc1c74489020..27b2466a800e 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: '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 3ab55cf51d1e..a7107d8584e1 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: '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 f6a5d715cc7e..0465e12448b3 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: '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 98411392d6d5..c4bb2422bde0 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: '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 e3dc47ae6f1c..9d9f0ac296f7 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: 'nautilus' benchmarks: radosbench: concurrent_ops: 4