- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci 1/2] send-internet-mail: update start
by Luan Shengde 08 Dec '20

08 Dec '20

use new mailbox for email than has been sent so we can use mutt to read the mails Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/send-internet-mail/start | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/container/send-internet-mail/start b/container/send-internet-mail/start index d6e4e25..02c6ab6 100755 --- a/container/send-internet-mail/start +++ b/container/send-internet-mail/start @@ -12,13 +12,13 @@ names = Set.new %w[ ROBOT_EMAIL_ADDRESS ROBOT_EMAIL_PASSWORD SEND_MAIL_PORT - MAILDIR + SENT_MAILDIR ] defaults = relevant_defaults(names) defaults['CCI_SRC'] = '/c/compass-ci' -defaults['MAILDIR'] ||= '/srv/cci/Maildir/.compass-ci' +defaults['SENT_MAILDIR'] ||= '/srv/cci/Maildir/.sent' defaults['HOST_SERVER'] = ENV['HOSTNAME'] env = docker_env(defaults) @@ -30,7 +30,7 @@ cmd = %w[ -d ] + env + %W[ -p #{defaults['SEND_MAIL_PORT']}:#{defaults['SEND_MAIL_PORT']} - -v #{defaults['MAILDIR']}:#{defaults['MAILDIR']}:rw + -v #{defaults['SENT_MAILDIR']}:#{defaults['SENT_MAILDIR']}:rw -v #{ENV['CCI_SRC']}:#{defaults['CCI_SRC']} -v /etc/localtime:/etc/localtime:ro -w #{defaults['CCI_SRC']}/container/send-internet-mail -- 2.23.0

1 0

[PATCH lkp-tests 1/2] spec/submit_spec: submit spec without my info
by Wei Jihui 08 Dec '20

08 Dec '20

delete my-info like my_uuid,my_email,my_name Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- spec/submit_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/submit_spec.rb b/spec/submit_spec.rb index 8310d629..77b64a7a 100644 --- a/spec/submit_spec.rb +++ b/spec/submit_spec.rb @@ -3,7 +3,7 @@ require "#{LKP_SRC}/lib/yaml" def stable_yaml_file(yaml_file) job = load_yaml(yaml_file) - delete_job_key = %w(LKP_DEBUG_PREFIX lkp_initrd_user job_origin) + delete_job_key = %w(LKP_DEBUG_PREFIX lkp_initrd_user job_origin my_uuid my_email my_name) job.delete_if do |key, _| delete_job_key.include?(key) || key.to_s.start_with?('#! ') || -- 2.23.0

2 1

[PATCH lkp-tests 2/2] spec/submit_spec: format the spec result
by Wei Jihui 08 Dec '20

08 Dec '20

Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- spec/submit/job_on_fail/job-3000.yaml | 10 +++++----- spec/submit/matrix/job-1-300-whetstone-double.yaml | 8 ++++---- spec/submit/matrix/job-3-300-shell1.yaml | 8 ++++---- spec/submit/merge_yaml/job-defaults.yaml | 10 +++++----- spec/submit/separate_yaml/job-1000-2-100000ss-add.yaml | 6 +++--- .../submit/separate_yaml/job-10000-2-100000ss-add.yaml | 6 +++--- spec/submit/separate_yaml/job-20-2-6000ss-cache.yaml | 6 +++--- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/spec/submit/job_on_fail/job-3000.yaml b/spec/submit/job_on_fail/job-3000.yaml index 3d7ad9b5..11d89b2b 100644 --- a/spec/submit/job_on_fail/job-3000.yaml +++ b/spec/submit/job_on_fail/job-3000.yaml @@ -2,7 +2,7 @@ suite: atomic on_fail: sleep: 3000 -atomic: +atomic: lab: spec_lab testbox: vm-2p8g--spec_submit tbox_group: vm-2p8g--spec_submit @@ -12,11 +12,11 @@ nr_node: 1 nr_cpu: 2 memory: 8G arch: aarch64 -cpufreq_governor: +cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y pp: sleep: 3000 - atomic: - cpufreq_governor: -monitors: + atomic: + cpufreq_governor: +monitors: diff --git a/spec/submit/matrix/job-1-300-whetstone-double.yaml b/spec/submit/matrix/job-1-300-whetstone-double.yaml index 9896bcef..78f79fa7 100644 --- a/spec/submit/matrix/job-1-300-whetstone-double.yaml +++ b/spec/submit/matrix/job-1-300-whetstone-double.yaml @@ -1,7 +1,7 @@ --- suite: unixbench runtime: 300 -unixbench: +unixbench: lab: spec_lab testbox: vm-2p8g--spec_submit nr_task: '1' @@ -13,7 +13,7 @@ nr_node: 1 nr_cpu: 2 memory: 8G arch: aarch64 -cpufreq_governor: +cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y pp: @@ -21,5 +21,5 @@ pp: runtime: 300 test: whetstone-double nr_task: '1' - cpufreq_governor: -monitors: + cpufreq_governor: +monitors: diff --git a/spec/submit/matrix/job-3-300-shell1.yaml b/spec/submit/matrix/job-3-300-shell1.yaml index 912d10ee..afe5a953 100644 --- a/spec/submit/matrix/job-3-300-shell1.yaml +++ b/spec/submit/matrix/job-3-300-shell1.yaml @@ -1,7 +1,7 @@ --- suite: unixbench runtime: 300 -unixbench: +unixbench: lab: spec_lab testbox: vm-2p8g--spec_submit nr_task: '3' @@ -13,7 +13,7 @@ nr_node: 1 nr_cpu: 2 memory: 8G arch: aarch64 -cpufreq_governor: +cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y pp: @@ -21,5 +21,5 @@ pp: runtime: 300 test: shell1 nr_task: '3' - cpufreq_governor: -monitors: + cpufreq_governor: +monitors: diff --git a/spec/submit/merge_yaml/job-defaults.yaml b/spec/submit/merge_yaml/job-defaults.yaml index 42b53c13..f72fd6ac 100644 --- a/spec/submit/merge_yaml/job-defaults.yaml +++ b/spec/submit/merge_yaml/job-defaults.yaml @@ -1,6 +1,6 @@ --- suite: atomic -atomic: +atomic: lab: spec_lab testbox: vm-2p8g--spec_submit tbox_group: vm-2p8g--spec_submit @@ -10,10 +10,10 @@ nr_node: 1 nr_cpu: 2 memory: 8G arch: aarch64 -cpufreq_governor: +cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y pp: - atomic: - cpufreq_governor: -monitors: + atomic: + cpufreq_governor: +monitors: diff --git a/spec/submit/separate_yaml/job-1000-2-100000ss-add.yaml b/spec/submit/separate_yaml/job-1000-2-100000ss-add.yaml index f3e2c553..a2355b50 100644 --- a/spec/submit/separate_yaml/job-1000-2-100000ss-add.yaml +++ b/spec/submit/separate_yaml/job-1000-2-100000ss-add.yaml @@ -14,7 +14,7 @@ nr_node: 1 nr_cpu: 2 memory: 8G arch: aarch64 -cpufreq_governor: +cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y pp: @@ -23,5 +23,5 @@ pp: samples: 100000ss freq: 1000 test: add - cpufreq_governor: -monitors: + cpufreq_governor: +monitors: diff --git a/spec/submit/separate_yaml/job-10000-2-100000ss-add.yaml b/spec/submit/separate_yaml/job-10000-2-100000ss-add.yaml index 63bac5cf..8a6317cb 100644 --- a/spec/submit/separate_yaml/job-10000-2-100000ss-add.yaml +++ b/spec/submit/separate_yaml/job-10000-2-100000ss-add.yaml @@ -14,7 +14,7 @@ nr_node: 1 nr_cpu: 2 memory: 8G arch: aarch64 -cpufreq_governor: +cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y pp: @@ -23,5 +23,5 @@ pp: samples: 100000ss freq: 10000 test: add - cpufreq_governor: -monitors: + cpufreq_governor: +monitors: diff --git a/spec/submit/separate_yaml/job-20-2-6000ss-cache.yaml b/spec/submit/separate_yaml/job-20-2-6000ss-cache.yaml index a802dc1b..15701ad0 100644 --- a/spec/submit/separate_yaml/job-20-2-6000ss-cache.yaml +++ b/spec/submit/separate_yaml/job-20-2-6000ss-cache.yaml @@ -14,7 +14,7 @@ nr_node: 1 nr_cpu: 2 memory: 8G arch: aarch64 -cpufreq_governor: +cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y pp: @@ -23,5 +23,5 @@ pp: samples: 6000ss freq: 20 test: cache - cpufreq_governor: -monitors: + cpufreq_governor: +monitors: -- 2.23.0

1 0

[PATCH v5 compass-ci] mail-robot: add check account exists for email
by Luan Shengde 08 Dec '20

08 Dec '20

avoid re-assign accounts for a single email address [why] the mail-robot may assign a new account if user send 'apply account' email with the same email address. and this is a big waste of account resource. [how] when receive request for applying an account, check whether the email already has already been assigned an account. assign a new one if there is none return the old one if there is already one and update info mail robot will update infos if the mail has been set new: - my_name - my_commit_url - my_ssh_pubkey Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/mail-robot/lib/apply-account.rb | 34 +++++++++++++++++------ 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/container/mail-robot/lib/apply-account.rb b/container/mail-robot/lib/apply-account.rb index bf40429..99da510 100755 --- a/container/mail-robot/lib/apply-account.rb +++ b/container/mail-robot/lib/apply-account.rb @@ -51,6 +51,8 @@ class ApplyAccount @send_mail_host = %x(/sbin/ip route | awk '/default/ {print $3}').chomp @send_mail_port = SEND_MAIL_PORT @mail_content = mail_content + @es_host = @send_mail_host + @es_port = ES_PORT @my_info = {} end @@ -61,9 +63,8 @@ class ApplyAccount # firstly get my_email before execute parse_mail_content is needed @my_info['my_email'] = @mail_content.from[0] parse_mail_content - acct_info = apply_my_account - - @my_info['my_login_name'] = acct_info['my_login_name'] + my_account_es = check_account_es + apply_my_account(my_account_es) store_account_info send_mail('') @@ -82,15 +83,30 @@ class ApplyAccount @my_info.update parsed_email_info end - def apply_my_account - my_uuid = %x(uuidgen).chomp - - @my_info['my_uuid'] = my_uuid + def apply_my_account(my_account_es) + apply_info = {} + if my_account_es + apply_info.update my_account_es + apply_info.update @my_info + @my_info.update apply_info + apply_info['is_update_account'] = true + else + my_uuid = %x(uuidgen).chomp + @my_info['my_uuid'] = my_uuid + apply_info.update @my_info + end + apply_new_account(apply_info, my_account_es) + end - apply_account = ApplyJumperAccount.new(@my_info) + def apply_new_account(apply_info, my_account_es) + apply_account = ApplyJumperAccount.new(apply_info) acct_info = apply_account.apply_jumper_account - return acct_info + @my_info['my_login_name'] = acct_info['my_login_name'] unless my_account_es + end + + def check_account_es + ESQuery.new(index: 'accounts').query_by_id(@my_info['my_email']) end def store_account_info -- 2.23.0

1 0

[PATCH lkp-tests] jobs: change the file permission
by Zhang Yu 08 Dec '20

08 Dec '20

The file permission should be consistent with the other file in this directory Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- jobs/mysql-server.yaml | 0 stats/crystal/sysbench-mysql.cr | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 jobs/mysql-server.yaml mode change 100755 => 100644 stats/crystal/sysbench-mysql.cr diff --git a/jobs/mysql-server.yaml b/jobs/mysql-server.yaml old mode 100755 new mode 100644 diff --git a/stats/crystal/sysbench-mysql.cr b/stats/crystal/sysbench-mysql.cr old mode 100755 new mode 100644 -- 2.23.0

1 0

[PATCH v3 lkp-tests] tests/build-pkg: fix upload in container
by Wang Yong 08 Dec '20

08 Dec '20

docker can not use mount operation, so now use curl to upload build-pkg cgz file Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- tests/build-pkg | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tests/build-pkg b/tests/build-pkg index b26798509..622bef1a3 100755 --- a/tests/build-pkg +++ b/tests/build-pkg @@ -18,6 +18,8 @@ ## See: https://wiki.archlinux.org/index.php/Makepkg . $LKP_SRC/lib/debug.sh +. $LKP_SRC/lib/env.sh +. $LKP_SRC/distro/common check_vars() { @@ -29,6 +31,13 @@ check_vars() [ -n "$os_mount" ] || die "os_mount is empty" } +mount_pkg_mnt() +{ + [ -n "$LKP_SERVER" ] && { + mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr,port=446 //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount" + } +} + mount_dest() { # the same image is mounted to cifs and nfs, the generated cgz files @@ -39,9 +48,7 @@ mount_dest() PKG_MNT=/initrd/build-pkg mkdir -p "$PKG_MNT" - [ -n "$LKP_SERVER" ] && { - mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr,port=446 //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount" - } + is_docker || mount_pkg_mnt } get_pkgfile() @@ -142,7 +149,11 @@ build_source_pkg() PACMAN=true BUILDDIR=$TMP CARCH=$os_arch PKGEXT=.cgz CGZDEST="$cgz_name" \ $LKP_SRC/sbin/makepkg -A --check --skippgpcheck --config $LKP_SRC/etc/makepkg.conf 2>&1 - [ "$?" == 0 ] && create_softlink + [ "$?" == 0 ] || exit 1 + create_softlink + + is_docker || exit 0 + upload_to_target_dir ${PKG_MNT}/${pack_to}/${pkgname} } check_vars -- 2.23.0

1 0

[PATCH v2 compass-ci] answerback-email: add check account exists
by Luan Shengde 08 Dec '20

08 Dec '20

add check account exists for assigning/updating account avoid re-assign accounts for single email address avoid update account for non-account email [why] the tool may assign a new account for the email even if the email already has one. it will cause a big waste of account resource for wrong operation or test. [how] add check account exists for the email before assigning a new account. Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/assign-account/answerback-email.rb | 36 ++++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/container/assign-account/answerback-email.rb b/container/assign-account/answerback-email.rb index 53c321d..c08f10e 100755 --- a/container/assign-account/answerback-email.rb +++ b/container/assign-account/answerback-email.rb @@ -61,21 +61,19 @@ conf_info = { 'is_update_account' => false } -def init_info(mail_content, email_info, my_info) +def init_info(mail_content, email_info, my_info, my_info_es) my_info['my_email'] = mail_content.from[0] + + read_my_login_name(my_info['my_email'], my_info_es) email_info['my_name'] = mail_content.From.unparsed_value.gsub(/ <[^<>]*>/, '') - return if mail_content.attachments.empty? - email_info['new_email_pubkey'] = mail_content.attachments[0].body.decoded.strip + email_info['new_email_pubkey'] = mail_content.attachments[0].body.decoded.strip || nil end def read_my_login_name(my_email, my_info_es) - my_account_info_str = %x(curl -XGET localhost:9200/accounts/_doc/#{my_email}) - my_account_info = YAML.safe_load my_account_info_str - message = "No such email found from the ES: #{my_email}" - raise message unless my_account_info['found'] + my_account_info = ESQuery.new(index: 'accounts').query_by_id(my_email) - my_info_es.update my_account_info['_source'] + my_info_es.update my_account_info || {} end options = OptionParser.new do |opts| @@ -102,6 +100,7 @@ options = OptionParser.new do |opts| end my_info['my_email'] = email_address + read_my_login_name(email_address, my_info_es) end opts.on('-n name', '--name name', 'appoint name') do |name| @@ -134,7 +133,7 @@ options = OptionParser.new do |opts| return false end mail_content = Mail.read(email_file) - init_info(mail_content, email_info, my_info) + init_info(mail_content, email_info, my_info, my_info_es) end opts.on('-g', '--gen-sshkey', 'generate jumper rsa public/private key and return pubkey') do @@ -142,7 +141,6 @@ options = OptionParser.new do |opts| end opts.on('-u', '--update', 'updata configurations') do - read_my_login_name(my_info['my_email'], my_info_es) conf_info['is_update_account'] = true end @@ -240,9 +238,27 @@ def check_my_name_exist(my_info) return false end +def check_email_assigned_account(conf_info, my_info_es) + if conf_info['is_update_account'] + return true unless my_info_es.empty? + + message = "The email has not assigned an account yet.\n" + message += "Delete the '-u' option to assign a new account." + else + return true if my_info_es.empty? + + message = "The email has already assigned an account.\n" + message += "You can use option '-u' to update the account." + end + puts message + + return false +end + def send_account(my_info, conf_info, email_info, my_info_es, stdin_info) return unless check_server return unless check_my_email(my_info) + return unless check_email_assigned_account(conf_info, my_info_es) my_info['my_uuid'] = %x(uuidgen).chomp unless conf_info['is_update_account'] build_my_info_from_input(my_info, email_info, my_info_es, stdin_info) -- 2.23.0

1 0

[PATCH v2 compass-ci 2/2] lib/compare_data_format.rb: fix NoMethodError
by Lu Kaiyi 08 Dec '20

08 Dec '20

[error] /home/lukaiyi/compass-ci/lib/compare_data_format.rb:57:in `block (2 levels) in assign_echart_source': undefined method `[]' for nil:NilClass (NoMethodError) from /home/lukaiyi/compass-ci/lib/compare_data_format.rb:55:in `each' from /home/lukaiyi/compass-ci/lib/compare_data_format.rb:55:in `block in assign_echart_source' from /home/lukaiyi/compass-ci/lib/compare_data_format.rb:53:in `each' from /home/lukaiyi/compass-ci/lib/compare_data_format.rb:53:in `assign_echart_source' from /home/lukaiyi/compass-ci/lib/compare_data_format.rb:46:in `block in assign_echart_data_set' from /home/lukaiyi/compass-ci/lib/compare_data_format.rb:39:in `each' from /home/lukaiyi/compass-ci/lib/compare_data_format.rb:39:in `assign_echart_data_set' from /home/lukaiyi/compass-ci/lib/compare_data_format.rb:30:in `block (2 levels) in convert_to_echart_dataset' from /home/lukaiyi/compass-ci/lib/compare_data_format.rb:29:in `each' from /home/lukaiyi/compass-ci/lib/compare_data_format.rb:29:in `block in convert_to_echart_dataset' from /home/lukaiyi/compass-ci/lib/compare_data_format.rb:28:in `each_value' from /home/lukaiyi/compass-ci/lib/compare_data_format.rb:28:in `convert_to_echart_dataset' from /home/lukaiyi/compass-ci/lib/compare_data_format.rb:21:in `format_for_echart' from /home/lukaiyi/compass-ci/lib/compare_matrixes.rb:512:in `show_compare_result' from /home/lukaiyi/compass-ci/lib/compare.rb:103:in `compare_by_template' from /home/lukaiyi/compass-ci/sbin/compare:70:in `<main>' Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- lib/compare_data_format.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/compare_data_format.rb b/lib/compare_data_format.rb index 1959045..bf4013b 100644 --- a/lib/compare_data_format.rb +++ b/lib/compare_data_format.rb @@ -53,7 +53,7 @@ class FormatEchartData dimensions.each do |dimension| dimension_values = [dimension] @x_params.each do |x_param| - if @metrics_compare_results[x_param][metric] + if @metrics_compare_results[x_param][metric] && @metrics_compare_results[x_param][metric][value_type] dimension_values << @metrics_compare_results[x_param][metric][value_type][dimension] else source[0].delete(x_param) -- 2.23.0

1 0

[PATCH v2 compass-ci 1/2] sbin/compare_template: friendly show compare template result in command line
by Lu Kaiyi 08 Dec '20

08 Dec '20

[why] friendly show compare template result in command line. [how] rehandle the json format result of "compare -t <compare_template.yaml>" with third-party module in python3. [usage] compare_template <compare_template.yaml> [example] compare_template compare_template.yaml in z9 [input] a compare_template.yaml like below: compare_metrics: - fio.write_iops - fio.read_iops filter: suite: - fio-basic os_arch: - aarch64 - x86 compare_dimensions: - os: debian os_version: sid - os: openeuler os_version: 20.03 x_params: - bs - test_size title: Hackbench Performance Testing unit: KB/s [output] Hackbench Performance Testing +------------------------------------+-----------+----------+----------+----------+----------+---------+---------+---------+----------+ | fio.read_iops | 4k|1G | 4k|80G | 16k|1G | 32k|1G | 64k|1G | 128k|1G | 256k|1G | 512k|1G | 1024k|1G | +------------------------------------+-----------+----------+----------+----------+----------+---------+---------+---------+----------+ | openeuler 20.03 average | 144076.29 | 11601.10 | 37865.30 | 21145.10 | 14010.34 | 6701.24 | 3205.08 | 1367.48 | 673.33 | | openeuler 20.03 standard_deviation | 195.00 | 0.00 | 214.00 | 205.00 | 188.00 | 183.00 | 180.00 | 191.00 | 191.00 | +------------------------------------+-----------+----------+----------+----------+----------+---------+---------+---------+----------+ Hackbench Performance Testing +------------------------------------+-----------+----------+----------+----------+---------+---------+---------+----------+ | fio.write_iops | 4k|1G | 16k|1G | 32k|1G | 64k|1G | 128k|1G | 256k|1G | 512k|1G | 1024k|1G | +------------------------------------+-----------+----------+----------+----------+---------+---------+---------+----------+ | openeuler 20.03 average | 122003.54 | 33528.53 | 31469.06 | 13870.14 | 8249.71 | 4329.45 | 1976.54 | 1141.00 | | openeuler 20.03 standard_deviation | 174.00 | 188.00 | 171.00 | 197.00 | 181.00 | 175.00 | 170.00 | 176.00 | +------------------------------------+-----------+----------+----------+----------+---------+---------+---------+----------+ Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- sbin/compare_template | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100755 sbin/compare_template diff --git a/sbin/compare_template b/sbin/compare_template new file mode 100755 index 0000000..6b702c0 --- /dev/null +++ b/sbin/compare_template @@ -0,0 +1,53 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +import os +import sys +import json +import prettytable as pt + +# receive compare_template.yaml and auto pretty show compare results +class TableShow: + def __init__(self, result_dict): + self.title = result_dict['title'] + self.tables = result_dict['tables'] + self.tb = None + + def show_table(self): + for (table_title, table) in self.tables.items(): + self.tb = pt.PrettyTable() + self.set_field_names(table, table_title) + self.set_align(table_title) + self.add_row(table) + self.print_table() + + def set_field_names(self, table, table_title): + field_names = [table_title] + field_names.extend(table['average']['source'][0]) + self.tb.field_names = field_names + + def set_align(self, table_title): + for field_name in self.tb.field_names: + self.tb.align[field_name] = 'r' + self.tb.align[table_title] = 'l' + + def add_row(self, table): + row_names = ['average', 'standard_deviation'] + for row_name in row_names: + row = table[row_name]['source'][1] + row_title = ' '.join([row[0], row_name]) + format_data_row = ["%.2f" % data for data in row[1:]] + self.tb.add_row([row_title, *format_data_row]) + + def print_table(self): + print(self.title) + print(self.tb) + print() + + +if __name__ == '__main__': + template_yaml = sys.argv[1] + result_dict = json.loads(os.popen(f"compare -t {template_yaml}").read()) + table_show = TableShow(result_dict) + table_show.show_table() -- 2.23.0

1 0

[PATCH lkp-tests] stats/iozone: fix rubocop warning
by Zhang Yu 08 Dec '20

08 Dec '20

iozone:17:34: C: Style/SlicingWithRange: Prefer ary[n..] over ary[n..-1]. data.insert i + 1, data[i][-8..-1] ^^^^^ iozone:21:8: C: Style/SlicingWithRange: Prefer ary[n..] over ary[n..-1]. data[2..-1].each_with_index do |v, i| ^^^^^ Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- stats/iozone | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stats/iozone b/stats/iozone index 32dce7ba..62184cb2 100755 --- a/stats/iozone +++ b/stats/iozone @@ -14,11 +14,11 @@ while (line = STDIN.gets) data = line.split data.each_index do |i| if data[i].size > 8 - data.insert i + 1, data[i][-8..-1] + data.insert i + 1, data[i][-8..] data[i] = data[i][0..-9] end end - data[2..-1].each_with_index do |v, i| + data[2..].each_with_index do |v, i| puts data[0] + 'KB_' + data[1] + 'reclen.' + keys[i] + ': ' + v per_io_type[keys[i]] ||= 0 per_io_type[keys[i]] += v.to_i -- 2.23.0

1 0