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

Re: [PATCH distro-info] get tag_prefix in a more reasonable way
by Du Kaitian 21 Aug '20

21 Aug '20

On Tue, Aug 18, 2020 at 12:20:47PM +0800, Li Ping wrote: >On Tue, Aug 18, 2020 at 10:02:45AM +0800, Wu Fengguang wrote: >>CC Shaofei. > >I have already CC All. > >> >>On Mon, Aug 17, 2020 at 07:32:45PM +0800, Li Ping wrote: >>>Previously, the tag_prefix was the first matched tag_prefix in git_tag. >>>It is easy to make errors >>> >>>So, I get ten matched tag_prefix in git_tag and choose the one that >>>appears the most >>>--- >>> archlinux/parse-git_tag.rb | 21 +++++++++++++++------ >>> 1 file changed, 15 insertions(+), 6 deletions(-) >>> >>>diff --git a/archlinux/parse-git_tag.rb b/archlinux/parse-git_tag.rb >>>index 85ab41e..22054ea 100755 >>>--- a/archlinux/parse-git_tag.rb >>>+++ b/archlinux/parse-git_tag.rb >>>@@ -35,15 +35,24 @@ rescue StandardError >>> end >>> >>> def write_config(config) >>>+ git_tags = {} >>>+ git_tags.default = ["", 0] >>>+ i = 0 >>> config['git_tag'].each do |tag| >>> next unless tag.to_s =~ /^([-_.a-zA-Z]*)\d+([._]?)/ >>>- >>>- config['tag_prefix'] = ("^#{Regexp.last_match(1)}" if Regexp.last_match(1)) >>>- config['separator'] = Regexp.last_match(2) >>>- File.open(file, 'w') do |f| >>>- f.write(config.to_yaml) >> >>swap the below 2 lines, to >>>+ git_tags["^#{Regexp.last_match(1)}"][0] = Regexp.last_match(2) >>>+ git_tags["^#{Regexp.last_match(1)}"][1] += 1 >> >> Move i += 1 here, like this > >Thank you for your reminder > >>>+ i += 1 >>>+ break if i > 9 >> >>>+ end >>>+ git_tags.each do |t, n| >>>+ if n[1] > git_tags[config['tag_prefix']][1] >> >>config['tag_prefix'] may be nil > >OK, I will add a code: >config['tag_prefix'] = "^#{Regexp.last_match(1)}" > >Thanks, >Ping 这个语句能够确保 config['tag_prefix'] 不为空么 >> >>>+ config['tag_prefix'] = t >>>+ config['separator'] = git_tags[t][0] >>> end >>>- break >>>+ end >>>+ File.open(file, 'w') do |f| >>>+ f.write(config.to_yaml) >>> end >>> end 这个想法很好，将 File.open 放到循环外面. 谢谢 jimmy >>> >>>-- >>>2.23.0 >>>

1 0

[PATCH crystal-ci] display colorful comparing results
by Lu Weitao 21 Aug '20

21 Aug '20

sample: sbin/compare "id=15104" "id=15409" --color 0 1 metric -------------------- ------------------------------ ------------------------------ %stddev change %stddev \ | \ 35110937.00 +2.0% 35854560.00 atomic.score 1.00 [93m+200.0% [0m 3.00 atomic.threads 11.14 +3.3% 11.51 atomic.time.elapsed_time 11.14 +3.3% 11.51 atomic.time.elapsed_time.max 22.00 [93m+27.0% [0m 28.00 atomic.time.involuntary_context_switches 4288.00 +1.0% 4352.00 atomic.time.maximum_resident_set_size 668.00 +0.0% 672.00 atomic.time.minor_page_faults 0.00 0 0.03 atomic.time.system_time 94.00 +10.0% 104.00 atomic.time.voluntary_context_switches 11.35 [93m+19.1% [0m 13.52 boot-time.boot 14.90 +14.8% 17.10 boot-time.idle 6990.00 [93m+56.0% [0m 10971.00 interrupts.2:GICv3.27.Level.arch_timer 463.00 [93m+313.0% [0m 1913.00 interrupts.38:GICv3.36.Level.virtio0 138.00 -3.0% 135.00 interrupts.45:ITS-MSI.32769.Edge.virtio1-control 3613.00 [93m+51.0% [0m 5473.00 interrupts.CPU0.2:GICv3.27.Level.arch_timer 138.00 -3.0% 135.00 interrupts.CPU0.45:ITS-MSI.32769.Edge.virtio1-control 1834.00 [93m+61.0% [0m 2968.00 interrupts.CPU0.IPI0:Rescheduling_interrupts 24.00 [91m-34.0% [0m 16.00 interrupts.CPU0.IPI1:Function_call_interrupts 3377.00 [93m+62.0% [0m 5498.00 interrupts.CPU1.2:GICv3.27.Level.arch_timer 463.00 [93m+313.0% [0m 1913.00 interrupts.CPU1.38:GICv3.36.Level.virtio0 1858.00 -8.0% 1723.00 interrupts.CPU1.IPI0:Rescheduling_interrupts 28.00 +7.0% 30.00 interrupts.CPU1.IPI1:Function_call_interrupts 3692.00 [93m+27.0% [0m 4691.00 interrupts.IPI0:Rescheduling_interrupts 52.00 -12.0% 46.00 interrupts.IPI1:Function_call_interrupts 375264.00 +8.0% 408058.00 meminfo.Active ... Signed-off-by: Lu Weitao <luweitao2(a)huawei.com> --- lib/compare.rb | 8 ++++---- lib/compare_matrixes.rb | 7 +++---- sbin/compare | 18 ++++++++++++++++-- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/lib/compare.rb b/lib/compare.rb index 4ef21b8..48367d9 100644 --- a/lib/compare.rb +++ b/lib/compare.rb @@ -16,10 +16,10 @@ require_relative './constants.rb' # - multiple conditions: "os=centos,debian suite=iperf,atomic" # -def compare_matrices_list(argv, common_conditions) +def compare_matrices_list(argv, common_conditions, options) condition_list = parse_argv(argv, common_conditions) matrices_list = create_matrices_list(condition_list) - compare_matrixes(matrices_list) + compare_matrixes(matrices_list, options: options) end def parse_argv(argv, common_conditions) @@ -53,11 +53,11 @@ end # - multiple dimensions: "os os_version ..." # -def compare_group(argv, dimensions) +def compare_group(argv, dimensions, options) conditions = parse_conditions(argv) dims = dimensions.split(' ') groups_matrices = create_groups_matrices_list(conditions, dims) - compare_group_matrices(groups_matrices) + compare_group_matrices(groups_matrices, options) end def create_groups_matrices_list(conditions, dims) diff --git a/lib/compare_matrixes.rb b/lib/compare_matrixes.rb index 9068073..b892826 100644 --- a/lib/compare_matrixes.rb +++ b/lib/compare_matrixes.rb @@ -187,7 +187,7 @@ def matrixes_empty?(matrixes_list) return matrixes_list.any?(&:empty?) end -def compare_matrixes(matrixes_list, matrixes_titles = matrixes_list.size, group_key = nil, options = {}) +def compare_matrixes(matrixes_list, matrixes_titles = matrixes_list.size, group_key = nil, options: {}) # compare matrix in matrixes_list and print info # # @matrixes_list: list consisting of matrix @@ -199,7 +199,6 @@ def compare_matrixes(matrixes_list, matrixes_titles = matrixes_list.size, group_ warn 'Matrix cannot be empty!' return end - options = { 'perf-profile': 5, theme: :none }.merge(options) matrixes_values = get_matrixes_values(matrixes_list, options) remove_unchanged_field(matrixes_values) @@ -375,7 +374,7 @@ end # compare each matrices_list within pre dimension of group matrices # input: group matrices # output: pre compare result of each group -def compare_group_matrices(group_matrices) +def compare_group_matrices(group_matrices, options) group_matrices.each do |k, v| matrices_list = [] matrices_titles = [] @@ -384,7 +383,7 @@ def compare_group_matrices(group_matrices) matrices_list << matrix end - compare_matrixes(matrices_list, matrices_titles, k) + compare_matrixes(matrices_list, matrices_titles, k, options: options) end end diff --git a/sbin/compare b/sbin/compare index bc63ace..c171894 100755 --- a/sbin/compare +++ b/sbin/compare @@ -10,6 +10,7 @@ # compare "commit=a12d232e" "commit=b3bacc31" # compare "os=debian" "os=centos" -c "suite=iperf" # compare "os=centos" -d "os_version os_arch" +# compare "os=centos" -d "os_version os_arch" --color -t light require 'optparse' require_relative '../lib/compare.rb' @@ -17,6 +18,9 @@ require_relative '../lib/compare.rb' common_conditions = '' is_group = false dimensions = nil +theme = :classic +color = false +options = {} opt_parser = OptionParser.new do |opts| opts.banner = 'Usage: compare "conditions" ... [option]' @@ -36,6 +40,14 @@ opt_parser = OptionParser.new do |opts| is_group = true end + opts.on('-t', '--theme theme', 'theme to compare: classic/focus_good/focus_bad/striking/light') do |t| + theme = t + end + + opts.on('--color', 'turn on colorful display with current theme') do + color = true + end + opts.on_tail('-h', '--help', 'show this message') do puts opts exit @@ -49,8 +61,10 @@ argv = if ARGV == [] end opt_parser.parse!(argv) +options = { theme: theme } if color + if is_group - compare_group(argv, dimensions) + compare_group(argv, dimensions, options) else - compare_matrices_list(argv, common_conditions) + compare_matrices_list(argv, common_conditions, options) end -- 2.23.0

2 2

[PATCH lkp-tests 2/3] delete the redundant /
by Zhou Shengrui 21 Aug '20

21 Aug '20

--- stats/crystal/mysql-server.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stats/crystal/mysql-server.cr b/stats/crystal/mysql-server.cr index dae06a35..82956c3d 100755 --- a/stats/crystal/mysql-server.cr +++ b/stats/crystal/mysql-server.cr @@ -1,7 +1,7 @@ #!/usr/bin/env crystal # frozen_string_literal: true -require "../..//lib/string_ext" +require "../../lib/string_ext" results = [] of String -- 2.23.0

1 0

[PATCH lkp-tests 1/3] mysql-server with crystal
by Zhou Shengrui 21 Aug '20

21 Aug '20

--- 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..dae06a35 --- /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

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

21 Aug '20

On Fri, Aug 21, 2020 at 02:26:38PM +0800, Zhou Shengrui wrote: >On Thu, Aug 20, 2020 at 07:04:40PM +0800, Lu Kaiyi wrote: >>fix syntax problem in line with crystal >> >>1. single-quotes to double-quotes >>2. $PROGRAM_NAME to PROGRAM_NAME >>3. stats = [] to stats = [] of String >>4. add type = "" before using >> >>Signed-off-by: Lu Kaiyi <lukaiyi(a)huawei.com> >>--- >> stats/crystal/test-bpf.cr | 39 +++++++++++++++++++-------------------- >> 1 file changed, 19 insertions(+), 20 deletions(-) >> >>diff --git a/stats/crystal/test-bpf.cr b/stats/crystal/test-bpf.cr >>index f5b13a09..3941a110 100644 >>--- a/stats/crystal/test-bpf.cr >>+++ b/stats/crystal/test-bpf.cr >>@@ -1,46 +1,45 @@ >>-#!/usr/bin/env ruby >>+#!/usr/bin/env crystal >> >>-LKP_SRC = ENV['LKP_SRC'] || File.dirname(File.dirname(File.reapath($PROGRAM_NAME))) >>+LKP_SRC = ENV["LKP_SRC"] || File.dirname(File.dirname(File.real_path(PROGRAM_NAME))) >> >>-require "#{LKP_SRC}/lib/string_ext" >>+require "../../lib/string_ext" >> >>-stats = [] >>+stats = [] of String >> success_test = 0 >> fail_test = 0 >> is_divided = false >> >> while (line = STDIN.gets) >>- line = line.remediate_invalid_byte_sequence(replace: '_') unless line.valid_encoding? >>- >> case line >> when /test_bpf: #[0-9]+ (.+) jited:.+ PASS$/ >>- type = $1.tr(' ', '_') >>- stats << type + '.pass: 1' >>+ type = $1.tr(" ", "_") >>+ stats << type + ".pass: 1" >> when /test_bpf: #[0-9]+ (.+) jited:.+ FAIL/ >>- type = $1.tr(' ', '_') >>- stats << type + '.fail: 1' >>+ type = $1.tr(" ", "_") >>+ stats << type + ".fail: 1" >> when /test_bpf: #[0-9]+ check: (.+) PASS$/ >>- type = $1.tr(' ', '_') >>- stats << 'check:_' + type + '.pass: 1' >>+ type = $1.tr(" ", "_") >>+ stats << "check:_" + type + ".pass: 1" >> when /test_bpf: #[0-9]+ check: (.+) FAIL/ >>- type = $1.tr(' ', '_') >>- stats << 'check:_' + type + '.fail: 1' >>+ type = $1.tr(" ", "_") >>+ stats << "check:_" + type + ".fail: 1" >> when /test_bpf: #[0-9]+ (.+) PASS$/ >>- type = $1.tr(' ', '_') >>- stats << type + '.pass: 1' >>+ type = $1.tr(" ", "_") >>+ stats << type + ".pass: 1" >> when /test_bpf: #[0-9]+ (.+) FAIL/ >>- type = $1.tr(' ', '_') >>- stats << type + '.fail: 1' >>+ type = $1.tr(" ", "_") >>+ stats << type + ".fail: 1" >> when /test_bpf: #[0-9]+ check: (.+)/ >>- type = 'check:_' + $1.strip.tr(' ', '_') >>+ type = "check:_" + $1.strip.tr(" ", "_") >> is_divided = true >> when /test_bpf: #[0-9]+ (.+)/ >>- type = $1.strip.tr(' ', '_') >>+ type = $1.strip.tr(" ", "_") >> is_divided = true > >"type" should not be null here,the content of "type" will be lost. >I think you can put it at the beginning of the program. > >Thanks >Shengrui > >> when /test_bpf: Summary: ([0-9]+) PASSED, ([0-9]+) FAILED, \[.+ JIT'ed\]$/ >> 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

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

21 Aug '20

On Fri, Aug 21, 2020 at 02:26:38PM +0800, Zhou Shengrui wrote: >On Thu, Aug 20, 2020 at 07:04:40PM +0800, Lu Kaiyi wrote: >>fix syntax problem in line with crystal >> >>1. single-quotes to double-quotes >>2. $PROGRAM_NAME to PROGRAM_NAME >>3. stats = [] to stats = [] of String >>4. add type = "" before using >> >>Signed-off-by: Lu Kaiyi <lukaiyi(a)huawei.com> >>--- >> stats/crystal/test-bpf.cr | 39 +++++++++++++++++++-------------------- >> 1 file changed, 19 insertions(+), 20 deletions(-) >> >>diff --git a/stats/crystal/test-bpf.cr b/stats/crystal/test-bpf.cr >>index f5b13a09..3941a110 100644 >>--- a/stats/crystal/test-bpf.cr >>+++ b/stats/crystal/test-bpf.cr >>@@ -1,46 +1,45 @@ >>-#!/usr/bin/env ruby >>+#!/usr/bin/env crystal >> >>-LKP_SRC = ENV['LKP_SRC'] || File.dirname(File.dirname(File.reapath($PROGRAM_NAME))) >>+LKP_SRC = ENV["LKP_SRC"] || File.dirname(File.dirname(File.real_path(PROGRAM_NAME))) >> >>-require "#{LKP_SRC}/lib/string_ext" >>+require "../../lib/string_ext" >> >>-stats = [] >>+stats = [] of String >> success_test = 0 >> fail_test = 0 >> is_divided = false >> >> while (line = STDIN.gets) >>- line = line.remediate_invalid_byte_sequence(replace: '_') unless line.valid_encoding? >>- >> case line >> when /test_bpf: #[0-9]+ (.+) jited:.+ PASS$/ >>- type = $1.tr(' ', '_') >>- stats << type + '.pass: 1' >>+ type = $1.tr(" ", "_") >>+ stats << type + ".pass: 1" >> when /test_bpf: #[0-9]+ (.+) jited:.+ FAIL/ >>- type = $1.tr(' ', '_') >>- stats << type + '.fail: 1' >>+ type = $1.tr(" ", "_") >>+ stats << type + ".fail: 1" >> when /test_bpf: #[0-9]+ check: (.+) PASS$/ >>- type = $1.tr(' ', '_') >>- stats << 'check:_' + type + '.pass: 1' >>+ type = $1.tr(" ", "_") >>+ stats << "check:_" + type + ".pass: 1" >> when /test_bpf: #[0-9]+ check: (.+) FAIL/ >>- type = $1.tr(' ', '_') >>- stats << 'check:_' + type + '.fail: 1' >>+ type = $1.tr(" ", "_") >>+ stats << "check:_" + type + ".fail: 1" >> when /test_bpf: #[0-9]+ (.+) PASS$/ >>- type = $1.tr(' ', '_') >>- stats << type + '.pass: 1' >>+ type = $1.tr(" ", "_") >>+ stats << type + ".pass: 1" >> when /test_bpf: #[0-9]+ (.+) FAIL/ >>- type = $1.tr(' ', '_') >>- stats << type + '.fail: 1' >>+ type = $1.tr(" ", "_") >>+ stats << type + ".fail: 1" >> when /test_bpf: #[0-9]+ check: (.+)/ >>- type = 'check:_' + $1.strip.tr(' ', '_') >>+ type = "check:_" + $1.strip.tr(" ", "_") >> is_divided = true >> when /test_bpf: #[0-9]+ (.+)/ >>- type = $1.strip.tr(' ', '_') >>+ type = $1.strip.tr(" ", "_") >> is_divided = true > >"type" should not be null here,the content of "type" will be lost. >I think you can put it at the beginning of the program. > >Thanks >Shengrui > that's right. thank you for pointing out. Thanks, Kaiyi > >> when /test_bpf: Summary: ([0-9]+) PASSED, ([0-9]+) FAILED, \[.+ JIT'ed\]$/ >> 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

Re: [PATCH crystal-ci] fix: some error in run job
by Wu Fengguang 21 Aug '20

21 Aug '20

>[ 8.061040] dracut-pre-pivot[653]: mkdir: cannot create directory >'/sysroot/tmp': File exists >[ 8.061818] dracut-pre-pivot[653]: mkdir: cannot create directory >'/sysroot/usr': File exists /usr 分明应该是目录. >[ 8.062597] dracut-pre-pivot[653]: mkdir: cannot create directory >'/sysroot/var': File exists >[ 8.063374] dracut-pre-pivot[653]: mkdir: cannot create directory >'/sysroot/vmlinuz': File exists > >可是这些目录应该有吧，也会报错。这是啥环境? 怎么复现? ls -l /sysroot 是啥调试输出? Thanks, Fengguang

2 1

[PATCH todo] mutt-git-am : fix shellcheck warning
by Bai Jing 21 Aug '20

21 Aug '20

problem: repos=$(cd $HOME/.am && echo *) ^-- SC2086: Double quote to prevent globbing and word splitting. ^-- SC2035: Use ./*glob* or --*glob* so names with dashes won't become options. Signed-off-by: Bai Jing <baijing14(a)huawei.com> --- bin/mutt-git-am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mutt-git-am b/bin/mutt-git-am index c2e8ebf..7a16105 100755 --- a/bin/mutt-git-am +++ b/bin/mutt-git-am @@ -8,7 +8,7 @@ patch=/tmp/$$.patch cat > $patch -repos=$(cd $HOME/.am && echo *) +repos=$(cd "$HOME"/.am && ls) repo=$(grep -m1 -o "Subject: .*] " $patch | grep -Eo "(${repos// /|})") cd "$HOME/.am/$repo" || exit -- 2.23.0

1 0

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

21 Aug '20

On Thu, Aug 20, 2020 at 07:04:40PM +0800, Lu Kaiyi wrote: >fix syntax problem in line with crystal > >1. single-quotes to double-quotes >2. $PROGRAM_NAME to PROGRAM_NAME >3. stats = [] to stats = [] of String >4. add type = "" before using > >Signed-off-by: Lu Kaiyi <lukaiyi(a)huawei.com> >--- > stats/crystal/test-bpf.cr | 39 +++++++++++++++++++-------------------- > 1 file changed, 19 insertions(+), 20 deletions(-) > >diff --git a/stats/crystal/test-bpf.cr b/stats/crystal/test-bpf.cr >index f5b13a09..3941a110 100644 >--- a/stats/crystal/test-bpf.cr >+++ b/stats/crystal/test-bpf.cr >@@ -1,46 +1,45 @@ >-#!/usr/bin/env ruby >+#!/usr/bin/env crystal > >-LKP_SRC = ENV['LKP_SRC'] || File.dirname(File.dirname(File.reapath($PROGRAM_NAME))) >+LKP_SRC = ENV["LKP_SRC"] || File.dirname(File.dirname(File.real_path(PROGRAM_NAME))) > >-require "#{LKP_SRC}/lib/string_ext" >+require "../../lib/string_ext" > >-stats = [] >+stats = [] of String > success_test = 0 > fail_test = 0 > is_divided = false > > while (line = STDIN.gets) >- line = line.remediate_invalid_byte_sequence(replace: '_') unless line.valid_encoding? >- > case line > when /test_bpf: #[0-9]+ (.+) jited:.+ PASS$/ >- type = $1.tr(' ', '_') >- stats << type + '.pass: 1' >+ type = $1.tr(" ", "_") >+ stats << type + ".pass: 1" > when /test_bpf: #[0-9]+ (.+) jited:.+ FAIL/ >- type = $1.tr(' ', '_') >- stats << type + '.fail: 1' >+ type = $1.tr(" ", "_") >+ stats << type + ".fail: 1" > when /test_bpf: #[0-9]+ check: (.+) PASS$/ >- type = $1.tr(' ', '_') >- stats << 'check:_' + type + '.pass: 1' >+ type = $1.tr(" ", "_") >+ stats << "check:_" + type + ".pass: 1" > when /test_bpf: #[0-9]+ check: (.+) FAIL/ >- type = $1.tr(' ', '_') >- stats << 'check:_' + type + '.fail: 1' >+ type = $1.tr(" ", "_") >+ stats << "check:_" + type + ".fail: 1" > when /test_bpf: #[0-9]+ (.+) PASS$/ >- type = $1.tr(' ', '_') >- stats << type + '.pass: 1' >+ type = $1.tr(" ", "_") >+ stats << type + ".pass: 1" > when /test_bpf: #[0-9]+ (.+) FAIL/ >- type = $1.tr(' ', '_') >- stats << type + '.fail: 1' >+ type = $1.tr(" ", "_") >+ stats << type + ".fail: 1" > when /test_bpf: #[0-9]+ check: (.+)/ >- type = 'check:_' + $1.strip.tr(' ', '_') >+ type = "check:_" + $1.strip.tr(" ", "_") > is_divided = true > when /test_bpf: #[0-9]+ (.+)/ >- type = $1.strip.tr(' ', '_') >+ type = $1.strip.tr(" ", "_") > is_divided = true > when /test_bpf: Summary: ([0-9]+) PASSED, ([0-9]+) FAILED, \[.+ JIT'ed\]$/ > success_test = $1 > fail_test = $2 > when /(PASS|FAIL)/ >+ type = "" "type" should not be null here,the content of "type" will be lost. I think you can put it at the beginning of the program. Thanks Shengrui > if is_divided > stats << type + ".#{$1.downcase}: 1" > is_divided = false >-- >2.23.0 >

1 0

[PATCH todo] todo/bin: fix shellcheck warning
by Zhang Yu 21 Aug '20

21 Aug '20

Signed-off-by: Zhang Yu <zhangyu424(a)huawei.com> --- bin/remind-credit | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/remind-credit b/bin/remind-credit index 887bd42..88a629c 100755 --- a/bin/remind-credit +++ b/bin/remind-credit @@ -3,14 +3,14 @@ credit_file=$(date -d Friday +%Y-%m-%d.md) -cd /c/todo.git +cd /c/todo.git || exit for p in $(git ls-tree --name-only HEAD people/) do [ "${p#people/.}" != "$p" ] && continue - [ -n "$(git ls-tree --name-only HEAD $p/credit/$credit_file)" ] && continue + [[ "$(git ls-tree --name-only HEAD "$p"/credit/"$credit_file")" ]] && continue - name=`basename $p` + name=$(basename "$p") # get mail name from /etc/people2mail.yaml mail_to=$(awk "/^$name: /{print \$2}" '/etc/people2mail.yaml') @@ -24,7 +24,7 @@ do # mail to $mail_to mail_subject="[CREDIT] vim people/$name/credit/$credit_file" - mail -s "$mail_subject" $mail_to <<-EOF + mail -s "$mail_subject" "$mail_to" <<-EOF Please create/push ASAP(ref: /etc/user-fullnames): cd ~/todo -- 2.23.0

1 0

[PATCH crystal-ci] sparrow/0-package: add /srv/osimage in tiny
by Hu Xuejiao 21 Aug '20

21 Aug '20

Because /srv/osimage is required to mapped in os-cifs-smb.conf/start. Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/1-storage/tiny | 1 + 1 file changed, 1 insertion(+) diff --git a/sparrow/1-storage/tiny b/sparrow/1-storage/tiny index 175787c..eb6f8b1 100755 --- a/sparrow/1-storage/tiny +++ b/sparrow/1-storage/tiny @@ -10,6 +10,7 @@ dirs=( /srv/initrd/pkg /srv/initrd/deps /srv/os + /srv/osimage /srv/redis /srv/result /srv/cci/scheduler -- 2.23.0

3 3

Re: [CREDIT] vim people/ZhangYu/credit/2020-08-21.md
by Wu Fengguang 21 Aug '20

21 Aug '20

On Fri, Aug 21, 2020 at 09:05:25AM +0800, Zhang Yu wrote: >On Fri, Aug 21, 2020 at 09:00:02AM +0800, Crystal TEAM wrote: >>Please create/push ASAP(ref: /etc/user-fullnames): >> >>cd ~/todo >>vim -O people/ZhangYu/credit/2020-08-21.md /etc/user-fullnames >>git add people/ZhangYu/credit/2020-08-21.md >>git commit -m "people who help me this week" >>git push > >This remind email maybe have some problem, I've created and pushed >credit yesterday. Thanks for the report. Fixed. Thanks, Fengguang

1 0

Re: [PATCH v2 crystal-ci] container/os-cifs: add cifs-/initrd/osimage/result in start
by Wu Fengguang 21 Aug '20

21 Aug '20

title is a bit mess. On Thu, Aug 20, 2020 at 09:02:23PM +0800, Hu Xuejiao wrote: >Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> >--- > container/os-cifs/start | 3 +++ > 1 file changed, 3 insertions(+) > >diff --git a/container/os-cifs/start b/container/os-cifs/start >index a26a58f..c1b3a28 100755 >--- a/container/os-cifs/start >+++ b/container/os-cifs/start >@@ -6,6 +6,9 @@ cmd=( > -p 445:445 > -v $PWD/smb.conf:/etc/samba/smb.conf > -v /srv/os:/srv/os:ro >+ -v /srv/osimage:/srv/osimage That can be removed. >+ -v /srv/initrd:/srv/initrd >+ -v /srv/result:/srv/result > --name samba > --restart=always > alpine/samba >-- >2.23.0 >

1 0

Re: [PATCH v2 crystal-ci] container/os-cifs: add cifs-initrd/osimage/result in smb.conf
by Wu Fengguang 21 Aug '20

21 Aug '20

On Thu, Aug 20, 2020 at 08:46:25PM +0800, Hu Xuejiao wrote: >Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> >--- > container/os-cifs/smb.conf | 26 +++++++++++++++++++++++++- > 1 file changed, 25 insertions(+), 1 deletion(-) > >diff --git a/container/os-cifs/smb.conf b/container/os-cifs/smb.conf >index e026cdb..819b702 100644 >--- a/container/os-cifs/smb.conf >+++ b/container/os-cifs/smb.conf >@@ -19,7 +19,7 @@ > unix extensions = yes > [os] > path = /srv/os/ >- comment = initrd >+ comment = os > browseable = yes > read only = yes > public = yes >@@ -27,3 +27,27 @@ > # that can only be accessed by root. > force user = root > force group = root >+[initrd] >+ path = /srv/initrd/ >+ comment = initrd >+ browseable = yes >+ read only = yes >+ public = yes >+ force user = root >+ force group = root root 不合适. >+[osimage] >+ path = /srv/osimage/ /srv/osimage => /srv/initrd >+ comment = osimage osimage => initrd osimage是为了兼容性创造的initrd的一个别名. >+ browseable = yes >+ read only = yes >+ public = yes >+ force user = root >+ force group = root >+[result] >+ path = /srv/result/ >+ comment = result >+ browseable = yes >+ read only = yes >+ public = yes >+ force user = root >+ force group = root >-- >2.23.0 >

1 0

Re: [PATCH todo] todo: fix git-count error
by Wu Fengguang 21 Aug '20

21 Aug '20

On Thu, Aug 20, 2020 at 08:21:18PM +0800, Bai Jing wrote: >On Thu, Aug 20, 2020 at 04:58:11PM +0800, Wu Fengguang wrote: >>两段unless File.exist?代码有重复, 一段是不是就够了? >> >>%x => system 更好些 >> >>>+unless File.exist?("#{ENV['HOME']}/.am") >>>+ repos.each_key do |repo| >>>+ %x(mkdir -p ~/.am && cd ~/.am && git clone file:///c/#{repo}.git) >>>+ end >>>+end >>>+ >>> count_by_name.sort_by { |k, _v| k } >>> >>> repos.each do |repo, files| >>>+ unless File.exist?("#{ENV['HOME']}/.am/#{repo}") >>>+ %x(cd ~/.am/ && git clone file:///c/#{repo}.git) >>>+ end >>>+ >>> %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| > >command : system("\"cd ~/.am/#{repo} && git shortlog -ens --no-merges --since >'#{days} days ago' -- #{files}\"") 是不是 \" 多余了 >I tried use system to replace "%x", but this command show below error. > >error : sh: cd ~/.am/ameba && git shortlog -ens --no-merges --since '1 days >ago' -- : No such file or directory

1 0

Re: [PATCH v5 iso2qcow2 4/6] feat: add os related conf and lib
by Wu Fengguang 21 Aug '20

21 Aug '20

On Thu, Aug 20, 2020 at 09:05:58PM +0800, Yu Chuan wrote: >>>>>这种有一般性, 网上搜一搜, 不需要自己写. >>>>> >>>>>比如 >>>>>~/lkp-tests/lib/detect-system.sh >>>>> >>>>>>+function get_host_info() { >>>>>>+ HOST_OS=$(cat /etc/os-release |grep ^NAME|awk -F '"' '{print $2}'| tr '[:upper:]' '[:lower:]') >>>>>>+ HOST_ARCH=$(arch) >>>>>>+ HOST_VERSION=$(cat /etc/os-release |grep ^VERSION_ID|awk -F '"' '{print $2}') >>>>>>+ check_host >>>>>>+} >>>> >>>>ok, i'll googled about this. >>> >>>Hi Fengguang, >>> >>>我搜了下网上相关功能的实现，以及 ~/lkp-tests/lib/detect-system.sh. 发 >>>现比较健壮可靠的方案是逐个系统进行判断。 >>> >>>所以我准备按如下方案进行实现，你看下是否可行？ >> >>detect-system.sh 还需要修改吗? > >yes, i tested this, and here is the output: > > [root@test ~]# cat ./get-info.sh > #!/bin/bash > > export LKP_SRC="/root/lkp-tests" > > source ${LKP_SRC}/lib/detect-system.sh > > detect_system > detect_system_arch > > echo _system_arch: $_system_arch > echo _system_name: $_system_name > echo _system_name_lowercase: $_system_name_lowercase > echo _system_version: $_system_version > [root@test ~]# sh ./get-info.sh > _system_arch: aarch64 > _system_name: openEuler > _system_name_lowercase: openeuler > _system_version: unknown > >主要是有两个问题： >1. system version 无法获取到。如20.03 这个需要直接 fix lkp-tests >2. detect-system.sh需要用到lkp-tests库中的其他代码，如果要使用这种方式， > 那么就需要分析其依赖，并将用到的所有代码都拷贝一份到iso2qcow2库中？可以啊. 依赖就是 . $LKP_SRC/lib/env.sh 注意license兼容性即可. Thanks, Fengguang >> >>>由于iso2qcow2对环境运行系统做了限制（conf/os/support-host.conf），所以 >>>关于操作系统信息的获得，准备参考~/lkp-tests/lib/detect-system.sh，使用 >>>“if-elif-fi”方式进行收集。 >>> >>>目前支持的系统仅为"openeuler-aarch64-20.03"，所以"if-elif-fi"只需要支持 >>>openeuler，随着以后支持系统的增多，再对此方法进行修正，增加支持新系统。 >>

1 0

[PATCH v3 lkp-tests] lib: add $RESULT_SERVER and update mount.cifs-comment job-init.sh
by Hu Xuejiao 21 Aug '20

21 Aug '20

For result mount in test-machine to add $RESULT_SERVER, $RESULT_SERVER is written in deploy-cci.yaml, and run clif for update mount.cifs-comment. Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- lib/job-init.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/job-init.sh b/lib/job-init.sh index 0732d4b9..eeac693e 100755 --- a/lib/job-init.sh +++ b/lib/job-init.sh @@ -51,11 +51,15 @@ setup_result_service() { [ -n "$result_service" ] && return [ -n "$NO_NETWORK" ] && return 1 + [ -n "$RESULT_SERVER" ] || $RESULT_SERVER=$LKP_SERVER - 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 + 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_raw_upload && result_service=raw_upload && return return 1 } @@ -94,7 +98,7 @@ mount_result_root() //*/*) result_fs=cifs modprobe cifs 2>/dev/null - local cifs_mount_option='-o guest' + local cifs_mount_option='-o guest,ro,hard,vers=1.0,noacl,nouser_xattr' [ -n "$LKP_CIFS_PORT" ] && cifs_mount_option="$cifs_mount_option,port=$LKP_CIFS_PORT" mount.cifs $cifs_mount_option $result_service $RESULT_MNT || return ;; -- 2.23.0

4 3

[PATCH todo] help me
by Hu Xuejiao 21 Aug '20

21 Aug '20

Signed-off-by: Hu Xuejiao <huxuejiao1(a)huawei.com> --- people/HuXuejiao/credit/2020-08-21.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 people/HuXuejiao/credit/2020-08-21.md diff --git a/people/HuXuejiao/credit/2020-08-21.md b/people/HuXuejiao/credit/2020-08-21.md new file mode 100644 index 0000000..c312427 --- /dev/null +++ b/people/HuXuejiao/credit/2020-08-21.md @@ -0,0 +1,4 @@ +Wei Jihui +Yu Chuan +Cao Xueliang +Liu Yinsi -- 2.23.0

1 0

[PATCH crystal-ci] feat: sched: import block_helper
by Tong Qunfeng 21 Aug '20

21 Aug '20

import BlockHelper to Sched. ===demo test code=== 1) add checkfile function at scheduler.cr def self.checkfile File.exists?("/home/chief/0.txt") end 2) add call to block_until_finished # echo alive get "/" do | _ | sched.block_helper.block_until_finished("1") { checkfile } "LKP Alive! The time is #{Time.local}, version = #{VERSION}" end 3) when scheduler is start up at (172.17.0.134:3000), call 3 times curl http://172.17.0.134:3000 - call at different shell - 2 time before create file "/home/chief/0.txt" - 1 time after create file "/home/chief/0.txt" 4) result the first 2 call was blocked. after the 3rd call: 3 curl respond with same message. - LKP Alive! The time is 2020-08-21 03:22:15 UTC, version = 0.2.0 and the scheduler logs shows: - 2020-08-21 03:22:15 UTC 200 GET / 375.36µs - 2020-08-21 03:22:15 UTC 200 GET / 49781.88ms - 2020-08-21 03:22:15 UTC 200 GET / 70282.96ms 1 response in 0.3ms, 1 in 4.9s and 1 in 7s Signed-off-by: Tong Qunfeng <tongqunfeng(a)huawei.com> --- src/lib/sched.cr | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index faa3553..60e97ba 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -3,6 +3,7 @@ require "kemal" require "./job" +require "./block_helper" require "./taskqueue_api" require "../scheduler/jobfile_operate" require "../scheduler/redis_client" @@ -12,11 +13,13 @@ class Sched property es property redis + property block_helper def initialize() @es = Elasticsearch::Client.new @redis = Redis::Client.new @task_queue = TaskQueueAPI.new + @block_helper = BlockHelper.new end def normalize_mac(mac : String) -- 2.23.0

1 0

Re: [PATCH crystal-ci] crystal-ci/container: add container for rsync service
by Liu Yinsi 21 Aug '20

21 Aug '20

On Thu, Aug 20, 2020 at 08:29:55PM +0800, Zhang Yu wrote: >Signed-off-by: Zhang Yu <zhangyu424(a)huawei.com> >+RUN apk add --no-cache rsync openssh \ >+ && rm -rf /var/cache/apk/* \ >+ && adduser lkp -u 1090 -g 1090 -D in sparrow/1-storage/permission, already add permission chown lkp:lkp /srv/result no need to adduser in Dockerfile. >+docker_rm rsync_server >+cmd=( >+ docker run >+ -id -i no need. --restart=always ^ if container needs to start always, add --restart=always. >+ --name=rsync_server >+ -v /srv/result:/result ^ is /srv/result? Thanks, Yinsi

2 1

[PATCH todo] remind-credit: ignore hidden files
by Wu Fengguang 21 Aug '20

21 Aug '20

Signed-off-by: Wu Fengguang <wufengguang(a)huawei.com> --- bin/remind-credit | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/remind-credit b/bin/remind-credit index 65d25d3..887bd42 100755 --- a/bin/remind-credit +++ b/bin/remind-credit @@ -7,6 +7,7 @@ cd /c/todo.git for p in $(git ls-tree --name-only HEAD people/) do + [ "${p#people/.}" != "$p" ] && continue [ -n "$(git ls-tree --name-only HEAD $p/credit/$credit_file)" ] && continue name=`basename $p` -- 2.23.0

1 0

[PATCH v2 todo 2/2] weekly credits
by Li Ping 21 Aug '20

21 Aug '20

--- people/LiPing/credit/2020-08-21.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 people/LiPing/credit/2020-08-21.md diff --git a/people/LiPing/credit/2020-08-21.md b/people/LiPing/credit/2020-08-21.md new file mode 100644 index 0000000..3914948 --- /dev/null +++ b/people/LiPing/credit/2020-08-21.md @@ -0,0 +1,8 @@ +Wu Zhende +Wu Fengguang +Wei Jihui +Luan Shengde +Cao Xueliang +Liu Shaofei +Xu Xijian +Li Yuanchao -- 2.23.0

1 0

[PATCH v2 todo 1/2] add todo
by Li Ping 21 Aug '20

21 Aug '20

--- .../LiPing/todo/20200831-12d:fill-email-head-and-body.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 people/LiPing/todo/20200831-12d:fill-email-head-and-body.md diff --git a/people/LiPing/todo/20200831-12d:fill-email-head-and-body.md b/people/LiPing/todo/20200831-12d:fill-email-head-and-body.md new file mode 100644 index 0000000..105ec52 --- /dev/null +++ b/people/LiPing/todo/20200831-12d:fill-email-head-and-body.md @@ -0,0 +1,9 @@ +# write email for test task done and bisect done + +get the information to fill the head and body + - find the lkp-test repo and bisect repo + - get the head and body + +call email service + + -- 2.23.0

1 0

Re: git bisect result
by Du Kaitian 21 Aug '20

21 Aug '20

标题需要修改，参考之前蚂蚁雄兵的标题格式 On Fri, Aug 21, 2020 at 10:13:12AM +0800, team(a)crystal.ci wrote: >573e4a8d2c9cc600ffeb109683d5a5904aa8fa50 is the first bad commit >commit 573e4a8d2c9cc600ffeb109683d5a5904aa8fa50 >Author: Dave Vasilevsky <dave(a)vasilevsky.ca> >Date: Sun Jul 26 16:34:00 2020 -0400 > > release 1.0.7 需要提供仓库地址 > NEWS | 10 ++++++++++ > configure.ac | 2 +- > 2 files changed, 11 insertions(+), 1 deletion(-) > 这个信息不完整，建议干脆删除，我们这里强调的是通过仓库地址及commit id 可以找到触发点,围绕这个点来提供邮件的信息 Thanks jimmy

1 0

[PATCH v2 lkp-tests] lib/job.rb: raise when no input testbox
by Wei Jihui 21 Aug '20

21 Aug '20

before fix: lib/job.rb:286:in `get_hosts_file': undefined method `split' for nil:NilClass (NoMethodError) after fix: lib/job.rb:269:in `load_hosts_config': hosts_file doesn't exist: /home/weijihui/lkp-tests/hosts/, please check your testbox (RuntimeError) Signed-off-by: Wei Jihui <weijihui2(a)huawei.com> --- lib/job.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/job.rb b/lib/job.rb index c8b5d82d..72397d8b 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -265,10 +265,7 @@ class Job return if @job.include?(:no_defaults) hosts_file = get_hosts_file - if !(File.exist? hosts_file) - raise "hosts_file doesn't exist: #{hosts_file}, please check your testbox" - end - return unless File.exist? hosts_file + File.file?(hosts_file) || raise("hosts_file doesn't exist: #{hosts_file}, please check your testbox") hwconfig = load_yaml(hosts_file, nil) @job[source_file_symkey(hosts_file)] = nil @@ -283,7 +280,7 @@ class Job tbox_group = tbox_group(@job['testbox']) end - hosts_file_name = tbox_group.split('--')[0] + hosts_file_name = tbox_group.to_s.split('--')[0] hosts_file = "#{LKP_SRC}/hosts/#{hosts_file_name}" end -- 2.23.0

1 0