August 2020 - Crystal-ci - mailweb.openeuler.org

[PATCH crystal-ci 2/4] lib/compare_matrixes.rb: fix compute reproduction error
by Zhang Yuhang 21 Aug '20

21 Aug '20

Signed-off-by: Zhang Yuhang <zhangyuhang25(a)huawei.com> --- lib/compare_matrixes.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/compare_matrixes.rb b/lib/compare_matrixes.rb index 4b23cbb..c22724b 100644 --- a/lib/compare_matrixes.rb +++ b/lib/compare_matrixes.rb @@ -53,14 +53,18 @@ def latency?(field) end # Core +def get_length_sum_average_sorted(value_list) + length = value_list.length + sum = value_list.sum + average = sum / length.to_f + sorted = value_list.sort + return length, sum, average, sorted +end def get_values(value_list, success) # get values(type: Hash) that include :average, :runs, :stddev_percent, ... # - sum = value_list.sum - length = value_list.length - average = sum / length - sorted = value_list.sort + length, sum, average, sorted = get_length_sum_average_sorted(value_list) if success stddev_percent = nil if length > 1 && average != 0 -- 2.23.0

1 0

[PATCH crystal-ci 1/4] lib/compare_matrixes.rb: change "runs:fails" to "fails:runs"
by Zhang Yuhang 21 Aug '20

21 Aug '20

Signed-off-by: Zhang Yuhang <zhangyuhang25(a)huawei.com> --- lib/compare_matrixes.rb | 28 ++++++++++++++-------------- lib/themes.rb | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/compare_matrixes.rb b/lib/compare_matrixes.rb index 9068073..4b23cbb 100644 --- a/lib/compare_matrixes.rb +++ b/lib/compare_matrixes.rb @@ -250,7 +250,7 @@ def get_html_header(matrixes_number, success) common_title = STDDEV_STR compare_title = CHANGE_STR else - common_title = RUNS_FAILS_STR + common_title = FAILS_RUNS_STR compare_title = REPRODUCTION_STR end @@ -270,9 +270,9 @@ def get_html_success(values, index) end def get_html_failure(values, index) - runs_fails_str = "#{values[:runs]}:#{values[:fails]}" + fails_runs_str = "#{values[:fails]}:#{values[:runs]}" reproduction_str = " <td>#{values[:reproduction]}%</td>\n" unless index.zero? - (reproduction_str || '') + " <td>#{runs_fails_str}</td>\n" + (reproduction_str || '') + " <td>#{fails_runs_str}</td>\n" end def get_html_values(matrixes, success) @@ -390,20 +390,20 @@ end # Format Fields -def format_runs_fails(runs, fails) - runs_width = (SUB_LONG_COLUMN_WIDTH * RUNS_PROPORTION).to_i - fails_width = SUB_LONG_COLUMN_WIDTH - runs_width - 3 +def format_fails_runs(fails, runs) + fails_width = (SUB_LONG_COLUMN_WIDTH * FAILS_PROPORTION).to_i + runs_width = SUB_LONG_COLUMN_WIDTH - fails_width - 1 runs_str = get_suitable_number_str( runs, runs_width, - "%#{runs_width}d" + "%-#{runs_width}d" ) fails_str = get_suitable_number_str( fails, fails_width, - "%-#{fails_width}d" + "%#{fails_width}d" ) - runs_str + ' : ' + fails_str + fails_str + ':' + runs_str end def format_reproduction(reproduction, theme) @@ -549,7 +549,7 @@ def get_header(matrixes_titles, success) common_title = STDDEV_STR compare_title = CHANGE_STR else - common_title = RUNS_FAILS_STR + common_title = FAILS_RUNS_STR compare_title = REPRODUCTION_STR end @@ -591,11 +591,11 @@ def get_failure_str(values, index, theme) ) end - runs_fails_str = format_runs_fails( - values[:runs], - values[:fails] + fails_runs_str = format_fails_runs( + values[:fails], + values[:runs] ) - (reproduction_str || '') + runs_fails_str + (reproduction_str || '') + fails_runs_str end def get_values_str(matrixes, success, theme) diff --git a/lib/themes.rb b/lib/themes.rb index 5788a25..0069fc3 100644 --- a/lib/themes.rb +++ b/lib/themes.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true COLUMN_WIDTH = 30 # print column width -INTERVAL_WIDTH = 1 # width of interval that between column +INTERVAL_WIDTH = 2 # width of interval that between column INTERVAL_BLANK = ' ' * INTERVAL_WIDTH # the sub_column that are children of column @@ -16,9 +16,9 @@ CHANGE_STR = 'change' STDDEV_STR = '%stddev' STDDEV_AVERAGE_PROPORTION = 5 / 8.0 FIELD_STR = 'metric' -RUNS_FAILS_STR = 'runs:fails' +FAILS_RUNS_STR = 'fails:runs' REPRODUCTION_STR = 'reproduction' -RUNS_PROPORTION = 3 / 7.0 +FAILS_PROPORTION = 4 / 7.0 # when change or reproduction greater or equal to GOOD_STANDARD # change show color. -- 2.23.0

1 0

[PATCH v4 crystal-ci] sparrow/6-test: update qemu
by Hu Xuejiao 21 Aug '20

21 Aug '20

Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/6-test/qemu | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sparrow/6-test/qemu b/sparrow/6-test/qemu index 6b5cd7f..ef3d340 100755 --- a/sparrow/6-test/qemu +++ b/sparrow/6-test/qemu @@ -3,10 +3,11 @@ run_job() { - export tbox_group=$2 - tj ../jobs/iperf-sparrow.yaml - cd /c/crystal-ci/providers - ./my-qemu.sh + submit -s "testbox: $1--$USER" /c/cci/user-client/jobs/iperf-sparrow.yaml + ( + export tbox_group=$1 + cd /c/cci/provider && ./my-qemu.sh + ) } cd /c/cci/user-client/helper -- 2.23.0

1 0

[PATCH lkp-tests] refactor(crystal/mysql-server.cr): msysql-server to mysql-server.cr
by Zhou Shengrui 21 Aug '20

21 Aug '20

create mysql-server.cr as same content with mysql-server Signed-off-by: Zhou Shengrui <zhoushengrui1(a)huawei.com> --- stats/crystal/mysql-server.cr | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100755 stats/crystal/mysql-server.cr diff --git a/stats/crystal/mysql-server.cr b/stats/crystal/mysql-server.cr new file mode 100755 index 00000000..82956c3d --- /dev/null +++ b/stats/crystal/mysql-server.cr @@ -0,0 +1,26 @@ +#!/usr/bin/env crystal +# frozen_string_literal: true + +require "../../lib/string_ext" + +results = [] of String + +while (line = STDIN.gets) + line = line.remediate_invalid_byte_sequence(replace: "_") unless line.valid_encoding? + line = line.to_s + + case line + # The output is as below: + # 200706 14:35:48 [ 99%] main.subquery_sj_innodb_all w8 [ pass ] 140 + # 200706 14:35:52 [ 99%] main.ssl_dynamic_persisted w1 [ fail ] 5953 + # 200706 14:35:59 [ 99%] main.mysql_upgrade_grant w7 [ skipped ] 80805 + when /\[\s*\d+\%\]/ + results << line.split("]")[1].split[0] + ".pass: 1" if line.includes?("[ pass ]") + results << line.split("]")[1].split[0] + ".fail: 1" if line.includes?("[ fail ]") + results << line.split("]")[1].split[0] + ".skip: 1" if line.includes?("[ skipped ]") + end +end + +results.each do |item| + puts item +end -- 2.23.0

1 0

[PATCH lkp-tests] fix(crystal/test-bpf.cr): fix $type value in loop
by Zhou Shengrui 21 Aug '20

21 Aug '20

$type in the loop is not null, so move $type location to gain normal value Signed-off-by: Zhou Shengrui<zhoushengrui1(a)huawei.com> --- stats/crystal/test-bpf.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stats/crystal/test-bpf.cr b/stats/crystal/test-bpf.cr index 3941a110..6f11e0ae 100644 --- a/stats/crystal/test-bpf.cr +++ b/stats/crystal/test-bpf.cr @@ -8,6 +8,7 @@ stats = [] of String success_test = 0 fail_test = 0 is_divided = false +type = "" while (line = STDIN.gets) case line @@ -39,7 +40,6 @@ while (line = STDIN.gets) success_test = $1 fail_test = $2 when /(PASS|FAIL)/ - type = "" if is_divided stats << type + ".#{$1.downcase}: 1" is_divided = false -- 2.23.0

1 0

[PATCH lkp-tests 3/3] put the variable type at the beginning
by Zhou Shengrui 21 Aug '20

21 Aug '20

Signed-off-by: Zhou Shengrui<zhoushengrui1(a)huawei.com> --- stats/crystal/test-bpf.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stats/crystal/test-bpf.cr b/stats/crystal/test-bpf.cr index 3941a110..6f11e0ae 100644 --- a/stats/crystal/test-bpf.cr +++ b/stats/crystal/test-bpf.cr @@ -8,6 +8,7 @@ stats = [] of String success_test = 0 fail_test = 0 is_divided = false +type = "" while (line = STDIN.gets) case line @@ -39,7 +40,6 @@ while (line = STDIN.gets) success_test = $1 fail_test = $2 when /(PASS|FAIL)/ - type = "" if is_divided stats << type + ".#{$1.downcase}: 1" is_divided = false -- 2.23.0

2 1

[PATCH v3 todo] todo: fix git-count error
by Bai Jing 21 Aug '20

21 Aug '20

Signed-off-by: Bai Jing <baijing14(a)huawei.com> --- bin/git-count | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/git-count b/bin/git-count index 2b1359b..5799054 100755 --- a/bin/git-count +++ b/bin/git-count @@ -56,9 +56,12 @@ end count_by_name.sort_by { |k, _v| k } +%x(mkdir -p #{ENV['HOME']}/.am) unless File.exist?("#{ENV['HOME']}/.am") repos.each do |repo, files| - %x(git -C ~/.am/#{repo} pull --rebase) - %x(cd ~/.am/#{repo} && git shortlog -ens --no-merges --since "#{days} days ago" -- #{files}).each_line do |line| + %x(cd #{ENV['HOME']}/.am/ && git clone file:///c/#{repo}.git) unless File.exist?("#{ENV['HOME']}/.am/#{repo}") + %x(git -C #{ENV['HOME']}/.am/#{repo} pull --rebase 2>&1) + file = %x(cd #{ENV['HOME']}/.am/#{repo} && git shortlog -ens --no-merges --since "#{days} days ago" -- #{files}) + file.each_line do |line| if line =~ /(\d+)\t(.*) <(.*)>/ count = $1.to_i name = $2 -- 2.23.0

2 4

git count
by Wu Fengguang 21 Aug '20

21 Aug '20

Zhende is this week's code star, thanks Zhende! wfg@crystal ~/todo% bin/git-count 17 Wu Zhende 12 Zhang Yuhang 8 Hu Xuejiao 8 Lu Kaiyi 7 Cao Xueliang 7 Yu Chuan 6 Tong Qunfeng 6 Ren Zhiwen 6 Wei Jihui 6 Wu Fengguang 6 Luan Shengde 5 Lu Weitao 5 Xiao Shenwei 3 Xu Xijian 3 Shi Zhichao 3 Zhang Yale 3 Zhang Yu 3 Wang Yong 3 Li Yuanchao 2 Liu Shaofei 2 Liu Yinsi 2 Li Ping 1 Bai Jing 1 Cui Yili 1 Wang Chenglong 1 Ren Wen 0 Du Kaitian 0 Sun Lijun 0 Sun Yukui 0 Lin Jiaxin 0 Liang Tao 0 Zhang Dewan 0 Zhou Shengrui 0 Xie Zheng

1 0

Re: command
by Wu Fengguang 21 Aug '20

21 Aug '20

On Fri, Aug 21, 2020 at 10:17:00AM +0800, Luan Shengde wrote: >On Fri, Aug 21, 2020 at 09:46:17AM +0800, Wu Fengguang wrote: >>As of version 18.03, you can use host.docker.internal as the host's IP. >> >>https://stackoverflow.com/questions/22944631/how-to-get-the-ip-address-of-t… > >excelent! >I will try it. >It seems that we need to add line in /etc/hosts: >host_id host.docker.internal which /etc/hosts? I just tried debian docker, the DNS is not available: wfg@debian ~% ping host.docker.internal ping: host.docker.internal: Name or service not known Thanks, Fengguang

2 2

[PATCH todo] todo: add 20200826-3D:load-default-config-when-submit-job.md
by Wei Jihui 21 Aug '20

21 Aug '20

Signed-off-by: Wei Jihui <weijihui2(a)huawei.com> --- ...-3D:load-default-config-when-submit-job.md | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 people/WeiJihui/todo/20200826-3D:load-default-config-when-submit-job.md diff --git a/people/WeiJihui/todo/20200826-3D:load-default-config-when-submit-job.md b/people/WeiJihui/todo/20200826-3D:load-default-config-when-submit-job.md new file mode 100644 index 0000000..71712b7 --- /dev/null +++ b/people/WeiJihui/todo/20200826-3D:load-default-config-when-submit-job.md @@ -0,0 +1,20 @@ +######## +# 1. Background +We has three places to place ours jobs's params when submit job. +- job.yaml +- /etc/crystal-ci/defaults/*.yaml +- #{ENV['HOME']}/.config/crystal-ci/defaults/*.yaml + +But same params must be place in job.yaml, or it will be raise error, +such as "testbox", it is because programs does not load last two yaml files +at the first. + +# 2. Solution +It should be change the load order, load all yaml files first. +order: +- load_default: + - load job yaml + - load /etc/crystal-ci/defaults/*.yaml + - load #{ENV['HOME']}/.config/crystal-ci/defaults/*.yaml +-load_hosts_config + -- 2.23.0

1 0