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

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