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

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