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

help star
by Wu Fengguang 28 Aug '20

28 Aug '20

Yu Chuan is this week's help star, thanks Yu Chuan! wfg@crystal ~/todo% bin/help-star people/*/credit/2020-08-28.md 46.0 Wu Fengguang 30.1 Yu Chuan 28.3 Cao Xueliang 15.0 Wu Zhende 14.2 Du Kaitian 13.5 Shi Zhichao 12.7 Wei Jihui 12.5 Luan Shengde 12.0 Liu Yinsi 11.2 Liu Shaofei 9.8 Lu Weitao 9.3 Hu Xuejiao 8.6 Xu Xijian 8.6 Tong Qunfeng 8.2 Cui Yili 7.2 Bai Jing 7.1 Li Yuanchao 6.9 Wang Yong 4.9 Sun Yukui 4.4 Xiao Shenwei 4.0 Zhang Yale 3.1 Ren Wen 2.8 Wang Chenglong 2.7 Zhou Shengrui 2.7 Zhang Yuhang 2.6 Ren Zhiwen 2.4 Zhang Dewan 2.4 Zhang Yu 1.7 Sun Lijun 1.6 Li Ping 1.2 Lin Jiaxin 1.2 Liang Tao 0.8 Lu Kaiyi 0.0 Wang Shuai 0.0 Cui Xucui 0.0 Xie Zheng

1 0

review star
by Wu Fengguang 28 Aug '20

28 Aug '20

Xiao Shenwei is this week's review star, thanks Shenwei! wfg@crystal ~/todo% bin/review-star Review email records in the last 7 days total review paragraph point people 193 117 235 64 Wu Fengguang 61 30 93 7 Tong Qunfeng 42 30 74 17 Du Kaitian 47 18 30 4 Xiao Shenwei 23 22 29 1 Sun Yukui 40 15 27 4 Luan Shengde 34 14 23 4 Cao Xueliang 56 7 22 1 Yu Chuan 54 12 22 13 Shi Zhichao 34 8 18 2 Lu Weitao 23 10 16 6 Li Yuanchao 29 12 14 2 Liu Yinsi 26 11 14 6 Wei Jihui 29 11 12 6 Xu Xijian 17 6 10 1 Wu Zhende

1 0

git count
by Wu Fengguang 28 Aug '20

28 Aug '20

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

1 0

[PATCH crystal-ci] sparrow: fix os-nfs run error
by Liu Yinsi 22 Aug '20

22 Aug '20

run container os-nfs failed. 1.use "--mount" to fix error message as follows: exportfs: /exports does not support NFS export ERROR: /usr/sbin/exportfs failed 2.add "fsid=0" to fix error message as follows: exportfs: /exports/result requires fsid= for NFS export exportfs: /exports/initrd requires fsid= for NFS export exportfs: /exports/osimage requires fsid= for NFS export exportfs: /exports/os-rw requires fsid= for NFS export exportfs: /exports/os requires fsid= for NFS export Signed-off-by: Liu Yinsi <liuyinsi(a)huawei.com> --- container/os-nfs/root/etc/exports | 10 +++++----- container/os-nfs/start | 1 + sparrow/4-docker/buildall | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/container/os-nfs/root/etc/exports b/container/os-nfs/root/etc/exports index 07ba95b..346542b 100644 --- a/container/os-nfs/root/etc/exports +++ b/container/os-nfs/root/etc/exports @@ -1,6 +1,6 @@ /exports *(ro,async,fsid=0,crossmnt,no_subtree_check,no_root_squash) -/exports/os *(ro,async,no_subtree_check,no_root_squash) -/exports/os-rw *(rw,async,no_subtree_check,no_root_squash) -/exports/osimage *(rw,async,no_subtree_check,insecure,all_squash,anonuid=1090,anongid=1090) -/exports/initrd *(rw,async,no_subtree_check,insecure,all_squash,anonuid=1090,anongid=1090) -/exports/result *(rw,async,no_subtree_check,insecure,all_squash,anonuid=1090,anongid=1090) +/exports/os *(ro,async,fsid=0,no_subtree_check,no_root_squash) +/exports/os-rw *(rw,async,fsid=0,no_subtree_check,no_root_squash) +/exports/osimage *(rw,async,fsid=0,no_subtree_check,insecure,all_squash,anonuid=1090,anongid=1090) +/exports/initrd *(rw,async,fsid=0,no_subtree_check,insecure,all_squash,anonuid=1090,anongid=1090) +/exports/result *(rw,async,fsid=0,no_subtree_check,insecure,all_squash,anonuid=1090,anongid=1090) diff --git a/container/os-nfs/start b/container/os-nfs/start index a95a0d8..e1dcb5e 100755 --- a/container/os-nfs/start +++ b/container/os-nfs/start @@ -19,6 +19,7 @@ cmd=( # -it --name os-nfs # avoid multiple containers -e NFS_DISABLE_VERSION_3=1 + --mount type=tmpfs,destination=/exports -v /srv/os:/exports/os:ro -v /srv/os:/exports/os-rw # for install/setup -v /srv/result:/exports/result diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index d03b7d7..d7a373c 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -33,7 +33,6 @@ do_one() [ -x build ] && ./build [ -x install ] && ./install [ -x first-run ] && ./first-run - [ "$container_name" == 'os-nfs' ] && exit [ -x start ] && ./start ) lockfile-remove --lock-name "$container_name".lock -- 2.23.0

2 4

[PATCH crystal-ci-dnsmasq] fix(os-nfs): os-rw dir should be writable
by Yu Chuan 21 Aug '20

21 Aug '20

Error Msg: [root@test tmp]# mount -t nfs x.x.x.x:/result ./result-mount-tmp/ [root@test tmp]# mount -t nfs x.x.x.x:/os-rw ./os-mount-tmp/ [root@test tmp]# touch result-mount-tmp/yc-test-1 [root@test tmp]# touch os-mount-tmp/yc-test-1 touch: cannot touch 'os-mount-tmp/yc-test-1': Read-only file system Signed-off-by: Yu Chuan <yuchuan6(a)huawei.com> --- container/os-nfs/root/etc/exports | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/os-nfs/root/etc/exports b/container/os-nfs/root/etc/exports index 07ba95b3ad23..4ffa03295823 100644 --- a/container/os-nfs/root/etc/exports +++ b/container/os-nfs/root/etc/exports @@ -1,6 +1,6 @@ /exports *(ro,async,fsid=0,crossmnt,no_subtree_check,no_root_squash) /exports/os *(ro,async,no_subtree_check,no_root_squash) -/exports/os-rw *(rw,async,no_subtree_check,no_root_squash) +/exports/os-rw *(rw,async,no_subtree_check,insecure,all_squash) /exports/osimage *(rw,async,no_subtree_check,insecure,all_squash,anonuid=1090,anongid=1090) /exports/initrd *(rw,async,no_subtree_check,insecure,all_squash,anonuid=1090,anongid=1090) /exports/result *(rw,async,no_subtree_check,insecure,all_squash,anonuid=1090,anongid=1090) -- 2.23.0

2 4

[PATCH crystal-ci] src/scheduler/scheduler.cr: add cluster sync API for multi-device tests
by Ren Wen 21 Aug '20

21 Aug '20

For multi-device tests. Signed-off-by: Ren Wen <renwen8(a)huawei.com> Signed-off-by: Bai Jing <baijing14(a)huawei.com> --- src/scheduler/scheduler.cr | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/scheduler/scheduler.cr b/src/scheduler/scheduler.cr index 0527bad..e917c98 100644 --- a/src/scheduler/scheduler.cr +++ b/src/scheduler/scheduler.cr @@ -154,4 +154,20 @@ module Scheduler sched.update_tbox_wtmp(env) "Done" end + + # cluster hosts report their states and request cluster state + # ~lkp/cgi-bin/lkp-cluster-sync?cluster=cs-lkp-hsw-ep5& + # node=vm-hi1620-1p1g--xx& + # state=wait_ready& + # ... + # function: handle_request + # return response according to different request state + # request state: + # wait_ready | abort | write_state | roles_ip | + # failed | finished | wait_finish + get "/~lkp/cgi-bin/lkp-cluster-sync" do |env| + respon = sched.handle_request(env.params) + debug_message(env, respon) + respon + end end -- 2.23.0

2 1

review star
by Wu Fengguang 21 Aug '20

21 Aug '20

Jihui is our review star, thanks Jihui! wfg@crystal ~/todo% bin/review-star Review email records in the last 7 days total review paragraph point people 231 117 217 71 Wu Fengguang 44 19 65 20 Tong Qunfeng 41 17 36 30 Shi Zhichao 44 30 28 8 Du Kaitian 25 15 21 4 Li Yuanchao 32 9 20 3 Wei Jihui 40 7 18 7 Zhang Yuhang 33 9 13 3 Lu Weitao 48 12 13 5 Xu Xijian 7 3 7 3 Liu Yinsi 41 4 6 10 Luan Shengde 4 2 5 3 Wang Chenglong 5 3 5 1 Lin Jiaxin 36 6 5 1 Ren Zhiwen 20 5 5 2 Cao Xueliang 12 3 4 0 Zhang Yu 21 10 4 14 Xiao Shenwei 22 3 3 0 Bai Jing 44 2 3 3 Wu Zhende 13 3 3 0 Zhang Yale 44 3 3 0 Lu Kaiyi 10 1 2 0 Zhou Shengrui 55 1 2 0 Yu Chuan 11 3 2 1 Liu Shaofei 4 2 2 0 Ren Wen 1 1 2 0 Sun Yukui 19 1 1 0 Wang Yong 2 1 1 2 Cui Yili 6 0 0 0 Liang Tao 23 0 0 0 Li Ping 34 0 0 0 Hu Xuejiao

1 0

help star
by Wu Fengguang 21 Aug '20

21 Aug '20

Xueliang is our help star, thanks Xueliang! wfg@crystal ~/todo% bin/help-star people/*/credit/2020-08-21.md 35.7 Wu Fengguang 23.8 Cao Xueliang 16.7 Shi Zhichao 15.6 Wei Jihui 14.8 Luan Shengde 13.3 Yu Chuan 13.2 Wu Zhende 13.2 Liu Shaofei 12.5 Du Kaitian 12.1 Tong Qunfeng 10.8 Ren Zhiwen 10.7 Lu Weitao 10.7 Wang Yong 9.9 Liu Yinsi 9.6 Lin Jiaxin 8.9 Bai Jing 8.2 Hu Xuejiao 8.0 Zhang Yu 6.2 Zhang Yuhang 5.9 Cui Yili 5.3 Li Yuanchao 4.0 Xu Xijian 3.8 Zhang Yale 3.0 Wang Chenglong 2.7 Ren Wen 2.6 Xiao Shenwei 2.4 Zhang Dewan 2.3 Li Ping 2.2 Liang Tao 1.8 Sun Yukui 0.0 Sun Lijun 0.0 Wang Shuai 0.0 Lu Kaiyi 0.0 Cui Xucui 0.0 Zhou Shengrui 0.0 Xie Zheng

1 0

[PATCH crystal-ci 4/4] lib/compare_matrixes.rb: optimize header and output format
by Zhang Yuhang 21 Aug '20

21 Aug '20

Signed-off-by: Zhang Yuhang <zhangyuhang25(a)huawei.com> --- lib/compare_matrixes.rb | 111 +++++++++++++++++++++++++--------------- 1 file changed, 70 insertions(+), 41 deletions(-) diff --git a/lib/compare_matrixes.rb b/lib/compare_matrixes.rb index 33ab805..3e5e4ed 100644 --- a/lib/compare_matrixes.rb +++ b/lib/compare_matrixes.rb @@ -447,14 +447,14 @@ def format_stddev_percent(stddev_percent, average_width) percent_width = SUB_LONG_COLUMN_WIDTH - average_width if stddev_percent if stddev_percent != 0 - percent_width -= 4 percent_str = get_suitable_number_str( stddev_percent.abs, - percent_width, - "%#{percent_width}d" + percent_width - 4, + "%-#{percent_width - 4}d" ) - # that symbol print width is 2 - return " ±#{percent_str}%" + space_index = percent_str.index(' ') || -1 + percent_str = percent_str.insert(space_index, '%') + return " ± #{percent_str}" end end ' ' * percent_width @@ -498,76 +498,103 @@ def get_liner(matrixes_number) liner + (INTERVAL_BLANK + '-' * COLUMN_WIDTH) * matrixes_number + "\n" end -def get_base_matrix_title(common_title) - format("%#{SUB_LONG_COLUMN_WIDTH}s", common_title) +def get_base_matrix_title(common_title, common_index) + str = ' ' * (SUB_LONG_COLUMN_WIDTH - common_title.length) + str.insert(common_index, common_title) end -def get_other_matrixes_title(common_title, compare_title, matrixes_number) - column = compare_title + ' ' * ( - COLUMN_WIDTH - common_title.length - compare_title.length +def get_other_matrix_title(common_title, compare_title, common_index) + column = ' ' * ( + COLUMN_WIDTH - common_title.length - compare_title.length + ) + compare_index = (SUB_SHORT_COLUMN_WIDTH - compare_title.length) / 2 + compare_index = 0 if compare_index.negative? + column = column.insert(compare_index, compare_title) + column.insert(SUB_SHORT_COLUMN_WIDTH + common_index, common_title) +end + +def get_other_matrixes_title(common_title, compare_title, matrixes_number, common_index) + column = INTERVAL_BLANK + get_other_matrix_title( + common_title, compare_title, common_index ) - column += common_title column * (matrixes_number - 1) end -def get_title(common_title, compare_title, matrixes_number) - title = get_base_matrix_title(common_title) - title += INTERVAL_BLANK + get_other_matrixes_title( - common_title, compare_title, matrixes_number +def get_title_name(success) + if success + common_title = STDDEV_STR + compare_title = CHANGE_STR + else + common_title = FAILS_RUNS_STR + compare_title = REPRODUCTION_STR + end + return common_title, compare_title +end + +def get_title(common_title, compare_title, matrixes_number, success, common_index) + common_index -= if success + common_title.length / 2 + else + common_title.index(':') + end + title = get_base_matrix_title(common_title, common_index) + title += get_other_matrixes_title( + common_title, compare_title, matrixes_number, common_index ) title += INTERVAL_BLANK + ' ' * COLUMN_WIDTH title + "\n" end -def get_base_matrix_title_symbol(common_title) +def get_base_matrix_title_symbol(common_index, success) title_symbol = ' ' * SUB_LONG_COLUMN_WIDTH - title_symbol[ - INTERVAL_WIDTH + SUB_LONG_COLUMN_WIDTH - common_title.length / 2 - ] = '\\' + title_symbol[common_index] = success ? '\\' : '|' title_symbol end -def get_other_matrixes_title_symbol(common_title, compare_title, matrixes_number) +def get_other_matrixes_title_symbol(_compare_title, matrixes_number, common_index, success) title_symbol = ' ' * ( (INTERVAL_WIDTH + COLUMN_WIDTH) * matrixes_number ) start_point = 0 - half_compare_title_length = compare_title.length / 2 - half_common_title_length = common_title.length / 2 + + common_symbol = success ? '\\' : '|' + compare_symbol = '|' + compare_index = SUB_SHORT_COLUMN_WIDTH / 2 (matrixes_number - 1).times do |_| start_point += INTERVAL_WIDTH - title_symbol[start_point + half_compare_title_length] = '|' + title_symbol[start_point + compare_index] = compare_symbol + title_symbol[start_point + SUB_SHORT_COLUMN_WIDTH + common_index] = common_symbol start_point += COLUMN_WIDTH - title_symbol[start_point - half_common_title_length] = '\\' end title_symbol end -def get_title_symbol(common_title, compare_title, matrixes_number) - title_symbol = get_base_matrix_title_symbol(common_title) +def get_title_symbol(compare_title, matrixes_number, common_index, success) + title_symbol = get_base_matrix_title_symbol(common_index, success) title_symbol += get_other_matrixes_title_symbol( - common_title, compare_title, matrixes_number + compare_title, matrixes_number, common_index, success ) title_symbol + "\n" end -def get_header(matrixes_titles, success) - if success - common_title = STDDEV_STR - compare_title = CHANGE_STR - else - common_title = FAILS_RUNS_STR - compare_title = REPRODUCTION_STR - end +def get_header(matrixes_titles, success, common_title, compare_title) + common_index = if success + # average + " + " + standard_deviation + STDDEV_AVERAGE_PROPORTION * SUB_LONG_COLUMN_WIDTH + 1 + else + # fails + ":" + runs + FAILS_PROPORTION * SUB_LONG_COLUMN_WIDTH + end header, matrixes_number = get_first_header(matrixes_titles) header += get_liner(matrixes_number) - header += get_title(common_title, compare_title, matrixes_number) + header += get_title(common_title, compare_title, matrixes_number, success, common_index) header += get_title_symbol( - common_title, compare_title, - matrixes_number + matrixes_number, + common_index, + success ) header end @@ -654,11 +681,13 @@ def show_result(matrixes_values, matrixes_list_length, theme) end def print_result(matrixes_values, matrixes_titles, success, theme) - return if matrixes_values[success].empty? + values = matrixes_values[success].sort + return if values.empty? print "\n\n\n" - print get_header(matrixes_titles, success) - matrixes_values[success].each do |field, matrixes| + common_title, compare_title = get_title_name(success) + print get_header(matrixes_titles, success, common_title, compare_title) + values.each do |field, matrixes| print get_values_str(matrixes, success, theme) print get_field_str(field) print "\n" -- 2.23.0

1 0

[PATCH crystal-ci 3/4] lib/comapre_matrixes.rb: optimization compare column output format
by Zhang Yuhang 21 Aug '20

21 Aug '20

Signed-off-by: Zhang Yuhang <zhangyuhang25(a)huawei.com> --- lib/compare_matrixes.rb | 43 +++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/lib/compare_matrixes.rb b/lib/compare_matrixes.rb index c22724b..33ab805 100644 --- a/lib/compare_matrixes.rb +++ b/lib/compare_matrixes.rb @@ -410,27 +410,31 @@ def format_fails_runs(fails, runs) fails_str + ':' + runs_str end -def format_reproduction(reproduction, theme) - reproduction_str = get_suitable_number_str( - reproduction, - SUB_SHORT_COLUMN_WIDTH - 1, - '%+.1f' - ) + '%' +def format_reproduction(reproduction, theme, compare_index) + if reproduction + reproduction_str = format('%+.1f%%', reproduction) + space_str = ' ' * (SUB_SHORT_COLUMN_WIDTH - reproduction_str.length) + reproduction_index = compare_index - reproduction_str.index('.') + reproduction_str = space_str.insert(reproduction_index, reproduction_str) + else + reproduction_str = format("%-#{SUB_SHORT_COLUMN_WIDTH}s", '0') + end color = get_compare_value_color(reproduction, theme) colorize( color, - format("%-#{SUB_SHORT_COLUMN_WIDTH}s", reproduction_str) + reproduction_str ) end -def format_change(change, theme) +def format_change(change, theme, compare_index) change_str = '0' if change - change_str = get_suitable_number_str( - change, - SUB_SHORT_COLUMN_WIDTH - 3, - '%+.1f' - ) + '%' + change_str = format('%+.1f%%', change) + space_str = ' ' * (SUB_SHORT_COLUMN_WIDTH - change_str.length) + change_index = compare_index - change_str.index('.') + change_str = space_str.insert(change_index, change_str) + else + change_str = format("%-#{SUB_SHORT_COLUMN_WIDTH}s", '0') end color = get_compare_value_color(change, theme) colorize( @@ -579,8 +583,8 @@ def get_first_header(matrixes_titles) [header, matrixes_number] end -def get_success_str(values, index, theme) - change_str = format_change(values[:change], theme) unless index.zero? +def get_success_str(values, index, theme, compare_index) + change_str = format_change(values[:change], theme, compare_index) unless index.zero? stddev_str = format_stddev( values[:average], values[:stddev_percent] @@ -588,10 +592,10 @@ def get_success_str(values, index, theme) (change_str || '') + stddev_str end -def get_failure_str(values, index, theme) +def get_failure_str(values, index, theme, compare_index) unless index.zero? reproduction_str = format_reproduction( - values[:reproduction], theme + values[:reproduction], theme, compare_index ) end @@ -604,14 +608,15 @@ end def get_values_str(matrixes, success, theme) values_str = '' + compare_index = SUB_SHORT_COLUMN_WIDTH / 2 matrixes.each do |index, values| values_str += if success get_success_str( - values, index, theme + values, index, theme, compare_index ) + INTERVAL_BLANK else get_failure_str( - values, index, theme + values, index, theme, compare_index ) + INTERVAL_BLANK end end -- 2.23.0

1 0

[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

[PATCH v4 lkp-tests] lib/job-init.sh: choose result service by $os_mount
by Hu Xuejiao 21 Aug '20

21 Aug '20

1. if no $RESULT_SERVER, default to $LKP_SERVER. 2. result service according to $os_mount, if no $os_mount, default original judge. Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- lib/job-init.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/job-init.sh b/lib/job-init.sh index 0732d4b9..42cfc2bd 100755 --- a/lib/job-init.sh +++ b/lib/job-init.sh @@ -51,9 +51,14 @@ setup_result_service() { [ -n "$result_service" ] && return [ -n "$NO_NETWORK" ] && return 1 + [ -n "$RESULT_SERVER" ] || $RESULT_SERVER=$LKP_SERVER + + if [ "$os_mount" == 'nfs' ] || [ -z "$os_mount" ]; then + supports_netfs 'nfs' && result_service=$RESULT_SERVER:/result && return + elif [ "$os_mount" == 'cifs' ] || [ -z "$os_mount" ]; then + supports_netfs 'cifs' && result_service=//$RESULT_SERVER/result && return + fi - supports_netfs 'nfs' && result_service=$LKP_SERVER:/result && return - supports_netfs 'cifs' && result_service=//$LKP_SERVER/result && return supports_raw_upload && result_service=raw_upload && return return 1 -- 2.23.0

2 1

Re: [PATCH v4 lkp-tests] lib/job-init.sh: choose result service by $os_mount
by Liu Shaofei 21 Aug '20

21 Aug '20

the title look not good, perhaps you should use the words "choose different service by os_mount". Thanks, Liushaofei

2 1

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

21 Aug '20

problem: sh: line 0: cd: /home/baijing/.am/todo: No such file or directory 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..21fd944 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 ~/.am/#{repo} pull --rebase 2>&1) + file = %x(cd ~/.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 2

Re: [PATCH lkp-tests 2/2] stats/crystal: test-bpf to test-bpf.cr
by Wu Fengguang 21 Aug '20

21 Aug '20

On Thu, Aug 20, 2020 at 10:16:52PM +0800, Lu Kaiyi wrote: >On Thu, Aug 20, 2020 at 07:45:33PM +0800, Wu Fengguang wrote: >>Kaiyi, 你做这么多转换, 用了之前我提到的两个工具了吧? >> > >To tell the truth, still not. but there's no much syntax difference between >ruby and crystal. 手工活尽量避免~ 这是一种态度. Thanks, Fengguang

1 0

Re: [PATCH lkp-tests 2/3] delete the redundant /
by Liu Shaofei 21 Aug '20

21 Aug '20

the title look not good, maybe can change "delete extra character". Thanks, Liushaofei

1 0